Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-collapse.t
changeset 48588 402a6b6173e9
parent 48584 74973a6d4e67
equal deleted inserted replaced
48587:3c8cc987672e 48588:402a6b6173e9 
   715   % |  1: f899f3910ce7 'B'
 
   715   % |  1: f899f3910ce7 'B'
 
   716   |/
 
   716   |/
 
   717   o  0: 4a2df7238c3b 'A'
 
   717   o  0: 4a2df7238c3b 'A'
 
   718   
   718   
   719   $ cat A
 
   719   $ cat A
 
   720   <<<<<<< dest:   82b8abf9c185 D - test: D
 
   720   <<<<<<< dest:             82b8abf9c185 D - test: D
 
   721   D
 
   721   D
 
   722   ||||||| base:   4a2df7238c3b A - test: A
 
   722   ||||||| parent of source: 4a2df7238c3b A - test: A
 
   723   A
 
   723   A
 
   724   =======
 
   724   =======
 
   725   B
 
   725   B
 
   726   >>>>>>> source: f899f3910ce7 B - test: B
 
   726   >>>>>>> source:           f899f3910ce7 B - test: B
 
   727   $ echo BC > A
 
   727   $ echo BC > A
 
   728   $ hg resolve -m
 
   728   $ hg resolve -m
 
   729   (no more unresolved files)
 
   729   (no more unresolved files)
 
   730   continue: hg rebase --continue
 
   730   continue: hg rebase --continue
 
   731   $ hg rebase --continue
 
   731   $ hg rebase --continue
 
   743   o |  1: f899f3910ce7 'B'
 
   743   o |  1: f899f3910ce7 'B'
 
   744   |/
 
   744   |/
 
   745   o  0: 4a2df7238c3b 'A'
 
   745   o  0: 4a2df7238c3b 'A'
 
   746   
   746   
   747   $ cat A
 
   747   $ cat A
 
   748   <<<<<<< dest:   82b8abf9c185 D - test: D
 
   748   <<<<<<< dest:             82b8abf9c185 D - test: D
 
   749   BC
 
   749   BC
 
   750   ||||||| base:   f899f3910ce7 B - test: B
 
   750   ||||||| parent of source: f899f3910ce7 B - test: B
 
   751   B
 
   751   B
 
   752   =======
 
   752   =======
 
   753   C
 
   753   C
 
   754   >>>>>>> source: 63668d570d21 C tip - test: C
 
   754   >>>>>>> source:           63668d570d21 C tip - test: C
 
   755   $ echo BD > A
 
   755   $ echo BD > A
 
   756   $ hg resolve -m
 
   756   $ hg resolve -m
 
   757   (no more unresolved files)
 
   757   (no more unresolved files)
 
   758   continue: hg rebase --continue
 
   758   continue: hg rebase --continue
 
   759   $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
 
   759   $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
mercurial