Loading ...
Sorry, an error occurred while loading the content.
 

Re: Monotone problems (3-way merge) fix

Expand Messages
  • dustinemptyspace
    Dear Øyvind, the error messages are still there ... (here follows an exaustive log) thanks a lot, Dustin ... sh-3.00$ pwd /mnt/shared2/slug/openembedded
    Message 1 of 7 , Feb 27, 2006
      Dear Øyvind,

      the error messages are still there ...
      (here follows an exaustive log)



      thanks a lot,
      Dustin



      ---------------------------------------------------------------------

      sh-3.00$ pwd
      /mnt/shared2/slug/openembedded
      sh-3.00$ wget http://ewi546.ewi.utwente.nl/OE/killrevs
      --21:38:57-- http://ewi546.ewi.utwente.nl/OE/killrevs
      => `killrevs.1'
      Resolving ewi546.ewi.utwente.nl... 130.89.145.130
      Connecting to ewi546.ewi.utwente.nl[130.89.145.130]:80... connected.
      HTTP request sent, awaiting response... 200 OK
      Length: 288 [text/plain]

      100%[====================================>] 288 --.--K/s


      21:38:57 (2.95 MB/s) - `killrevs.1' saved [288/288]

      sh-3.00$ for i in `cat killrevs` ; do monotone
      --db=../monotone/nslu2-linux.db \
      > db kill_rev_locally $i ; done
      monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
      already has children. We cannot kill it.
      sh-3.00$ for i in `cat killrevs` ; do monotone
      --db=../monotone/nslu2-linux.db db kill_rev_locally $i ; done
      monotone: misuse: no such revision
      '601faaded8a6427e29dc8dc43433fe9be662c96c'
      monotone: misuse: no such revision
      '680ed6274f4c973ac350fa89a09c39128b0a2758'
      monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
      already has children. We cannot kill it.
      monotone: misuse: no such revision
      'fac9555337e7b9a6c77de5eea67fa836b2c4c0da'
      monotone: misuse: no such revision
      'ae31942b97ba423ebde9fdc4d30732681e69d6dd'
      monotone: misuse: no such revision
      'aafd39c8d1b4e9183c4892194aa78c79a62bb8de'
      monotone: misuse: no such revision
      'd36f69289f03c75db72375cba8d47b713a10221e'
      sh-3.00$ for i in `cat killrevs` ; do monotone
      --db=../monotone/nslu2-linux.db db kill_rev_locally $i ; done
      monotone: misuse: no such revision
      '601faaded8a6427e29dc8dc43433fe9be662c96c'
      monotone: misuse: no such revision
      '680ed6274f4c973ac350fa89a09c39128b0a2758'
      monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
      already has children. We cannot kill it.
      monotone: misuse: no such revision
      'fac9555337e7b9a6c77de5eea67fa836b2c4c0da'
      monotone: misuse: no such revision
      'ae31942b97ba423ebde9fdc4d30732681e69d6dd'
      monotone: misuse: no such revision
      'aafd39c8d1b4e9183c4892194aa78c79a62bb8de'
      monotone: misuse: no such revision
      'd36f69289f03c75db72375cba8d47b713a10221e'
      sh-3.00$ cd ..
      sh-3.00$ ls
      bitbake downloads Makefile openembedded scripts
      common killrevs monotone openslug ucslugc
      debianslug ludeos MT optware unslung
      sh-3.00$ make update
      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,149 | 44 | 4,622
      monotone: bytes in | bytes out | certs in | revs in | revs written
      monotone: 32.5 k | 11.6 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: 32.5 k | 11.6 k | 26 | 6 | 6
      monotone: successful exchange with monotone.nslu2-linux.org
      if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ;
      then \
      monotone merge -b org.nslu2-linux.dev ; \
      fi
      monotone update
      monotone: already up to date at c0ba0d091b9b9d305c7b90b4a835b697880883eb
      if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ;
      then \
      monotone merge -b org.nslu2-linux.dev ; \
      fi
      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,167 | 44 | 4,628
      monotone: bytes in | bytes out | certs in | revs in | revs written
      monotone: 196 | 1,182 | 0 | 0 | 0
      monotone: successful exchange with monotone.nslu2-linux.org
      if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1"
      ] ; then \
      monotone merge -b org.nslu2-linux.bitbake ; \
      fi
      ( cd bitbake ; monotone update )
      monotone: already up to date at fba7388aec0d3ca1652b873b7b074f028dbe8fa3
      if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1"
      ] ; then \
      monotone merge -b org.nslu2-linux.bitbake ; \
      fi
      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,167 | 44 | 4,628
      monotone: bytes in | bytes out | certs in | revs in | revs written
      monotone: 196 | 1,182 | 0 | 0 | 0
      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 / 2
      monotone: merging with revision 2 / 2
      monotone: [source] 601faaded8a6427e29dc8dc43433fe9be662c96c
      monotone: [source] 6fdb3347025c12bf6ebe065971216714232b9f38
      monotone: common ancestor 12a6de359b9473aa7a0519d10d446e0f00fe0190
      koen@... 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
      No external 3-way merge command found.
      You may want to check that $EDITOR is set to an editor that supports
      3-way merge,
      set this explicitly in your get_preferred_merge3_command hook,
      or add a 3-way merge program to your path.

      monotone: misuse: merge of 'classes/tinderclient.bbclass' :
      'dcf3bce86efb605ee5acfd17ac59339a0df79f28' ->
      '9d19d2acb906956726ef59fc3060235fd5607cf8' vs
      '1d5ef8a1d8a03a670e0f7b713fcaf7c841270b5d' failed
      make: *** [update-openembedded] Error 1

      ---------------------------------------------------------------------
      monotone heads
      monotone: branch 'org.nslu2-linux.dev' is currently merged:
      c0ba0d091b9b9d305c7b90b4a835b697880883eb rwhitby@...
      2006-02-25T07:18:46








      --- In nslu2-linux@yahoogroups.com, Øyvind Repvik <oyvind@...> wrote:
      >
      > dustinemptyspace wrote:
      > > Dooesn't seem to work:
      > > (here is the result)
      > >
      > > monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
      > > already has children. We cannot kill it.
      > Just ignore the errormessage. If you do a "monotone heads" afterwards,
      > you will see that there is only one head.
      >
      > >
      > > If I try to start from scratch. Downloading the makefle in a empty dir
      > > and executing it I get:
      > Strange. It might be that the compressed snapshot hasn't been updated
      > yet. Try the fix once more, and don't start over afterwards ;-)
      >
      > Regards,
      > Øyvind
      >
    • Øyvind Repvik
      ... Sorry about that. Someone synced the defective stuff back again. I ve removed it yet again. Please do the fix once more, and then make update. It should be
      Message 2 of 7 , Feb 27, 2006
        dustinemptyspace wrote:
        > Dear Øyvind,
        >
        > the error messages are still there ...
        Sorry about that. Someone synced the defective stuff back again. I've
        removed it yet again. Please do the fix once more, and then make update.
        It should be fixed now. Trying to figure out where the broken sync came
        from.

        Regards,
        Øyvind

        > (here follows an exaustive log)
        >
        >
        >
        > thanks a lot,
        > Dustin
        >
        >
        >
        > ---------------------------------------------------------------------
        >
        > sh-3.00$ pwd
        > /mnt/shared2/slug/openembedded
        > sh-3.00$ wget http://ewi546.ewi.utwente.nl/OE/killrevs
        > --21:38:57-- http://ewi546.ewi.utwente.nl/OE/killrevs
        > => `killrevs.1'
        > Resolving ewi546.ewi.utwente.nl... 130.89.145.130
        > Connecting to ewi546.ewi.utwente.nl[130.89.145.130]:80... connected.
        > HTTP request sent, awaiting response... 200 OK
        > Length: 288 [text/plain]
        >
        > 100%[====================================>] 288 --.--K/s
        >
        >
        > 21:38:57 (2.95 MB/s) - `killrevs.1' saved [288/288]
        >
        > sh-3.00$ for i in `cat killrevs` ; do monotone
        > --db=../monotone/nslu2-linux.db \
        >> db kill_rev_locally $i ; done
        > monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
        > already has children. We cannot kill it.
        > sh-3.00$ for i in `cat killrevs` ; do monotone
        > --db=../monotone/nslu2-linux.db db kill_rev_locally $i ; done
        > monotone: misuse: no such revision
        > '601faaded8a6427e29dc8dc43433fe9be662c96c'
        > monotone: misuse: no such revision
        > '680ed6274f4c973ac350fa89a09c39128b0a2758'
        > monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
        > already has children. We cannot kill it.
        > monotone: misuse: no such revision
        > 'fac9555337e7b9a6c77de5eea67fa836b2c4c0da'
        > monotone: misuse: no such revision
        > 'ae31942b97ba423ebde9fdc4d30732681e69d6dd'
        > monotone: misuse: no such revision
        > 'aafd39c8d1b4e9183c4892194aa78c79a62bb8de'
        > monotone: misuse: no such revision
        > 'd36f69289f03c75db72375cba8d47b713a10221e'
        > sh-3.00$ for i in `cat killrevs` ; do monotone
        > --db=../monotone/nslu2-linux.db db kill_rev_locally $i ; done
        > monotone: misuse: no such revision
        > '601faaded8a6427e29dc8dc43433fe9be662c96c'
        > monotone: misuse: no such revision
        > '680ed6274f4c973ac350fa89a09c39128b0a2758'
        > monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
        > already has children. We cannot kill it.
        > monotone: misuse: no such revision
        > 'fac9555337e7b9a6c77de5eea67fa836b2c4c0da'
        > monotone: misuse: no such revision
        > 'ae31942b97ba423ebde9fdc4d30732681e69d6dd'
        > monotone: misuse: no such revision
        > 'aafd39c8d1b4e9183c4892194aa78c79a62bb8de'
        > monotone: misuse: no such revision
        > 'd36f69289f03c75db72375cba8d47b713a10221e'
        > sh-3.00$ cd ..
        > sh-3.00$ ls
        > bitbake downloads Makefile openembedded scripts
        > common killrevs monotone openslug ucslugc
        > debianslug ludeos MT optware unslung
        > sh-3.00$ make update
        > 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,149 | 44 | 4,622
        > monotone: bytes in | bytes out | certs in | revs in | revs written
        > monotone: 32.5 k | 11.6 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: 32.5 k | 11.6 k | 26 | 6 | 6
        > monotone: successful exchange with monotone.nslu2-linux.org
        > if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ;
        > then \
        > monotone merge -b org.nslu2-linux.dev ; \
        > fi
        > monotone update
        > monotone: already up to date at c0ba0d091b9b9d305c7b90b4a835b697880883eb
        > if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ;
        > then \
        > monotone merge -b org.nslu2-linux.dev ; \
        > fi
        > 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,167 | 44 | 4,628
        > monotone: bytes in | bytes out | certs in | revs in | revs written
        > monotone: 196 | 1,182 | 0 | 0 | 0
        > monotone: successful exchange with monotone.nslu2-linux.org
        > if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1"
        > ] ; then \
        > monotone merge -b org.nslu2-linux.bitbake ; \
        > fi
        > ( cd bitbake ; monotone update )
        > monotone: already up to date at fba7388aec0d3ca1652b873b7b074f028dbe8fa3
        > if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1"
        > ] ; then \
        > monotone merge -b org.nslu2-linux.bitbake ; \
        > fi
        > 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,167 | 44 | 4,628
        > monotone: bytes in | bytes out | certs in | revs in | revs written
        > monotone: 196 | 1,182 | 0 | 0 | 0
        > 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 / 2
        > monotone: merging with revision 2 / 2
        > monotone: [source] 601faaded8a6427e29dc8dc43433fe9be662c96c
        > monotone: [source] 6fdb3347025c12bf6ebe065971216714232b9f38
        > monotone: common ancestor 12a6de359b9473aa7a0519d10d446e0f00fe0190
        > koen@... 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
        > No external 3-way merge command found.
        > You may want to check that $EDITOR is set to an editor that supports
        > 3-way merge,
        > set this explicitly in your get_preferred_merge3_command hook,
        > or add a 3-way merge program to your path.
        >
        > monotone: misuse: merge of 'classes/tinderclient.bbclass' :
        > 'dcf3bce86efb605ee5acfd17ac59339a0df79f28' ->
        > '9d19d2acb906956726ef59fc3060235fd5607cf8' vs
        > '1d5ef8a1d8a03a670e0f7b713fcaf7c841270b5d' failed
        > make: *** [update-openembedded] Error 1
        >
        > ---------------------------------------------------------------------
        > monotone heads
        > monotone: branch 'org.nslu2-linux.dev' is currently merged:
        > c0ba0d091b9b9d305c7b90b4a835b697880883eb rwhitby@...
        > 2006-02-25T07:18:46
        >
        >
        >
        >
        >
        >
        >
        >
        > --- In nslu2-linux@yahoogroups.com, Øyvind Repvik <oyvind@...> wrote:
        >> dustinemptyspace wrote:
        >>> Dooesn't seem to work:
        >>> (here is the result)
        >>>
        >>> monotone: misuse: revision 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0
        >>> already has children. We cannot kill it.
        >> Just ignore the errormessage. If you do a "monotone heads" afterwards,
        >> you will see that there is only one head.
        >>
        >>> If I try to start from scratch. Downloading the makefle in a empty dir
        >>> and executing it I get:
        >> Strange. It might be that the compressed snapshot hasn't been updated
        >> yet. Try the fix once more, and don't start over afterwards ;-)
        >>
        >> Regards,
        >> Øyvind
        >>
        >
        >
        >
        >
        >
        >
        >
        > Yahoo! Groups Links
        >
        >
        >
        >
        >
        >
      • fransmeulenbroeks
        ... Note that this is the wrong datbase to check with monotone heads. You should give the monotone heads command in the openenbedded directory. The nslu2-linux
        Message 3 of 7 , Feb 27, 2006
          --- In nslu2-linux@yahoogroups.com, "dustinemptyspace"
          <dustinemptyspace@...> wrote:

          > monotone: misuse: merge of 'classes/tinderclient.bbclass' :
          > 'dcf3bce86efb605ee5acfd17ac59339a0df79f28' ->
          > '9d19d2acb906956726ef59fc3060235fd5607cf8' vs
          > '1d5ef8a1d8a03a670e0f7b713fcaf7c841270b5d' failed
          > make: *** [update-openembedded] Error 1
          >
          > ---------------------------------------------------------------------
          > monotone heads
          > monotone: branch 'org.nslu2-linux.dev' is currently merged:
          > c0ba0d091b9b9d305c7b90b4a835b697880883eb rwhitby@...
          > 2006-02-25T07:18:46

          Note that this is the wrong datbase to check with monotone heads.
          You should give the monotone heads command in the openenbedded
          directory. The nslu2-linux database is perfectly ok.

          FM
        • dustinemptyspace
          You are right :-) here is the output! # monotone head monotone: branch org.openembedded.dev is currently unmerged: 601faaded8a6427e29dc8dc43433fe9be662c96c
          Message 4 of 7 , Feb 28, 2006
            You are right :-)

            here is the output!

            # monotone head
            monotone: branch 'org.openembedded.dev' is currently unmerged:
            601faaded8a6427e29dc8dc43433fe9be662c96c frederic@...
            2006-02-20T14:43:35
            6fdb3347025c12bf6ebe065971216714232b9f38 xora@...
            2006-02-27T16:36:08


            thanks,
            Dustin

            --- In nslu2-linux@yahoogroups.com, "fransmeulenbroeks"
            <fransmeulenbroeks@...> wrote:
            >
            > --- In nslu2-linux@yahoogroups.com, "dustinemptyspace"
            > <dustinemptyspace@> wrote:
            >
            > > monotone: misuse: merge of 'classes/tinderclient.bbclass' :
            > > 'dcf3bce86efb605ee5acfd17ac59339a0df79f28' ->
            > > '9d19d2acb906956726ef59fc3060235fd5607cf8' vs
            > > '1d5ef8a1d8a03a670e0f7b713fcaf7c841270b5d' failed
            > > make: *** [update-openembedded] Error 1
            > >
            > > ---------------------------------------------------------------------
            > > monotone heads
            > > monotone: branch 'org.nslu2-linux.dev' is currently merged:
            > > c0ba0d091b9b9d305c7b90b4a835b697880883eb rwhitby@
            > > 2006-02-25T07:18:46
            >
            > Note that this is the wrong datbase to check with monotone heads.
            > You should give the monotone heads command in the openenbedded
            > directory. The nslu2-linux database is perfectly ok.
            >
            > FM
            >
          Your message has been successfully submitted and would be delivered to recipients shortly.