Mercurial > hg > gitweb

view tests/test-merge-revert2.out @ 831:232d0616a80a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleaned up trap handling: - Use numbers instead of signal names - No need to explicitly call "cleanup_exit RC" to exit with return code RC.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:43:05 +0100
parents 8f5637f0a0c0
children ad8ff3534fde 1fe3b14c7044 9c918287d10b
line wrap: on
line source

+ hg init
+ hg add file1 file2
+ hg commit -m added file1 and file2 -d 0 0 -u user
+ hg commit -m changed file1 -d 0 0 -u user
+ hg -q log
1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
0:8633637036c18f021d771208e16ae3508ab81d28
+ hg id
3aa14bbc23d9 tip
+ hg update -C 0
+ hg id
8633637036c1
+ hg id
8633637036c1+
+ hg revert
+ hg diff
+ hg status
+ hg id
8633637036c1
+ hg update
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg update -C 0
+ hg update
merge: warning: conflicts during merge
merging file1
merging file1 failed!
+ hg diff
diff -r 3aa14bbc23d9 file1
--- a/file1
+++ b/file1
@@ -1,2 +1,6 @@
 added file1
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
+ hg status
M file1
+ hg id
3aa14bbc23d9+ tip
+ hg revert
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg revert -r tip
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg update -C
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip