Mercurial > hg > gitweb

annotate tests/test-rename-dir-merge2.out @ 4365:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 4787e2b0dd03
children bb1800a7d7e1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 adding a/f
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 copying a/f to b/f
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 removing a/f
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 adding a/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 pulling from ../r2
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 searching for changes
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 adding changesets
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 adding manifests
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 adding file changes
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
11 added 1 changesets with 1 changes to 1 files (+1 heads)
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 (run 'hg heads' to see heads, 'hg merge' to merge)
4304
4787e2b0dd03 merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents: 4115
diff changeset
13 merging a/f and b/f
4787e2b0dd03 merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents: 4115
diff changeset
14 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15 (branch merge, don't forget to commit)
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 M b/f
4304
4787e2b0dd03 merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents: 4115
diff changeset
17 a/f
4115
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
18 A b/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
19 a/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20 R a/aa/g
c95060a5391a merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
21 R a/f