Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 14 Oct 2006 10:53:29 +0200
changeset 3389 efbe24c7d8d9
parent 3388 5eecae4ff722
child 3390 a74addddd092
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)
tests/test-merge8 file | annotate | diff | comparison | revisions
tests/test-merge8.out file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge8	Sat Oct 14 10:53:29 2006 +0200
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Test for changeset ba7c74081861
+# (update dirstate correctly for non-branchmerge updates)
+hg init a
+cd a
+echo a > a
+hg add a
+hg commit -m a
+cd ..
+hg clone a b
+cd a
+hg mv a b
+hg commit -m move
+echo b >> b
+hg commit -m b
+cd ../b
+hg pull ../a
+hg update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge8.out	Sat Oct 14 10:53:29 2006 +0200
@@ -0,0 +1,10 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+pulling from ../a
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 1 files
+(run 'hg update' to get a working copy)
+merging a and b
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Mercurial