Mercurial Mercurial > pub > hg > evolve / 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-evolve-public-content-divergent-main.t
changeset 4577 bcd52ce0916d
parent 4576 96ce1030d2fb
child 4625 a4fde4e3e763
equal deleted inserted replaced
4576:96ce1030d2fb 4577:bcd52ce0916d 
   504   (no more unresolved files)
 
   504   (no more unresolved files)
 
   505   continue: hg evolve --continue
 
   505   continue: hg evolve --continue
 
   506 
   506 
   507   $ hg evolve --continue
 
   507   $ hg evolve --continue
 
   508   committed as 2a0f44767904
 
   508   committed as 2a0f44767904
 
   509   working directory is now at 2a0f44767904
 
   509   working directory is now at 93cd84bbdaca
 
   510 
   510 
   511   $ hg evolve -l
 
   511   $ hg evolve -l
 
   512   $ cd ..
 
   512   $ cd ..
 
   513 
   513 
   514 Testing when relocation, merging both conflict:
 
   514 Testing when relocation, merging both conflict:
 
   632   (no more unresolved files)
 
   632   (no more unresolved files)
 
   633   continue: hg evolve --continue
 
   633   continue: hg evolve --continue
 
   634 
   634 
   635   $ hg evolve --continue
 
   635   $ hg evolve --continue
 
   636   committed as b9082a9e66ce
 
   636   committed as b9082a9e66ce
 
   637   working directory is now at b9082a9e66ce
 
   637   working directory is now at 93cd84bbdaca
 
   638 
   638 
   639   $ hg evolve -l
 
   639   $ hg evolve -l
 
   640   $ cd ..
 
   640   $ cd ..
evolve