[slug@Woonkamer openembedded]$ mt merge
monotone: starting with revision 1 / 2
monotone: merging with revision 2 / 2
monotone: [source] 6fdb3347025c12bf6ebe065971216714232b9f38
monotone: [source] bf751c693cb0aa66fdfbf2e072c7ac7e772351ce
monotone: common ancestor ae273a2de4c05752a9e1804c5c2809e14b1d568b eFfeM@openembedded.org 2006-02-27T13:39:29 found
monotone: trying 3-way merge
enter passphrase for key ID [eFfeM@openembedded.org]:
monotone: [merged] afeccda0a029718396b7650c73d2eba191335fa5
monotone: note: your working copies have not been updated
[slug@Woonkamer openembedded]$ mt commit */distro
monotone: beginning commit on branch 'org.openembedded.dev'
enter passphrase for key ID [eFfeM@openembedded.org]:
monotone: committed revision 1b40358f6780e83c543c70e31d60b6ac676544e8
monotone: note: this revision creates divergence
monotone: note: you may (or may not) wish to run 'monotone merge'
[slug@Woonkamer openembedded]$ cd ..
[slug@Woonkamer OpenSlugHead]$ pwd
/home/slug/OpenSlugHead
[slug@Woonkamer OpenSlugHead]$ make push-openembedded
monotone pull
monotone: doing anonymous pull; use -kKEYNAME if you need authentication
monotone: connecting to monotone.nslu2-linux.org
monotone: finding items to synchronize:
monotone: certs | keys | revisions
monotone: 14,158 | 44 | 4,625
monotone: bytes in | bytes out | certs in | revs in | revs written
monotone: 34.6 k | 15.9 k | 26 | 6 | 1
monotone: verifying new revisions (this may take a while)
monotone: bytes in | bytes out | certs in | revs in | revs written
monotone: 34.6 k | 16.0 k | 26 | 6 | 6
monotone: successful exchange with monotone.nslu2-linux.org
if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \
monotone merge -b org.openembedded.dev ; \
fi
monotone: starting with revision 1 / 3
monotone: merging with revision 2 / 3
monotone: [source] 1b40358f6780e83c543c70e31d60b6ac676544e8
monotone: [source] 601faaded8a6427e29dc8dc43433fe9be662c96c
monotone: common ancestor 12a6de359b9473aa7a0519d10d446e0f00fe0190 koen@openembedded.org 2006-02-13T22:06:00 found
monotone: trying 3-way merge
monotone: help required for 3-way merge
monotone: [ancestor] classes/tinderclient.bbclass
monotone: [ left] classes/tinderclient.bbclass
monotone: [ right] classes/tinderclient.bbclass
monotone: [ merged] classes/tinderclient.bbclass
WARNING: 'meld' was choosen to perform external 3-way merge.
You should merge all changes to *CENTER* file due to limitation of program
arguments.
executing external 3-way merge command
Traceback (most recent call last):
File "/usr/bin/meld", line 106, in ?
meldapp.main()
File "/usr/share/meld/meldapp.py", line 873, in main
app.main()
File "/usr/share/meld/gnomeglade.py", line 108, in main
gtk.main()
KeyboardInterrupt
monotone: interrupted
make: *** [update-openembedded] Error 1
[slug@Woonkamer OpenSlugHead]$ mt heads
monotone: branch 'org.nslu2-linux.dev' is currently merged:
c0ba0d091b9b9d305c7b90b4a835b697880883eb rwhitby@nslu2-linux.org 2006-02-25T07:18:46
[slug@Woonkamer OpenSlugHead]$ cd open*
[slug@Woonkamer openembedded]$ mt heads
monotone: branch 'org.openembedded.dev' is currently unmerged:
1b40358f6780e83c543c70e31d60b6ac676544e8 eFfeM@openembedded.org 2006-02-27T20:33:47
601faaded8a6427e29dc8dc43433fe9be662c96c frederic@openembedded.org 2006-02-20T14:43:35
afeccda0a029718396b7650c73d2eba191335fa5 eFfeM@openembedded.org 2006-02-27T20:31:30
[slug@Woonkamer openembedded]$