##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert: fix test-convert-svn-* problems with mtime not changing...
convert: fix test-convert-svn-* problems with mtime not changing The `svn commit` command does not detect changed files unless their mtime has changed. A quick succession of, for instance, `svn co ...; echo x >> y; svn ci` can thus lead to the change to y being ignored. Edited by pmezard to write in binary mode.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r6439:c1b47c0f default
Show More
test-merge10.out
20 lines | 643 B | text/plain | TextLexer
/ tests / test-merge10.out
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 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 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging testdir/subdir/a and testdir/a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M testdir/subdir/a
diff -r d02b3fc32762 testdir/subdir/a
--- a/testdir/subdir/a
+++ b/testdir/subdir/a
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
 r4696 -a
+alpha