Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
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-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 22 Jul 2005 08:11:49 +0100
changeset 756 5d79dfa5e98f
parent 749 7e4843b7efd2
child 767 61ed30e82b27
permissions -rw-r--r--
Added new code contributors, fixed Vincent's name, added hint on encoding.

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
mercurial-crew-with-dirclash