author | Matt Mackall <mpm@selenic.com> |
Mon, 16 Apr 2007 09:51:50 -0500 | |
changeset 4348 | b633f470944e |
parent 4304 | 4787e2b0dd03 |
child 4416 | bb1800a7d7e1 |
permissions | -rw-r--r-- |
3735 | 1 |
adding a/a |
2 |
adding a/b |
|
3 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 |
copying a/a to b/a |
|
5 |
copying a/b to b/b |
|
6 |
removing a/a |
|
7 |
removing a/b |
|
8 |
2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
9 |
resolving manifests |
|
10 |
overwrite None partial False |
|
11 |
ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 |
|
12 |
a/c: remote renamed directory to b/c -> d |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
13 |
a/a: remote moved to b/a -> m |
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
14 |
a/b: remote moved to b/b -> m |
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
15 |
copying a/a to b/a |
3735 | 16 |
removing a/a |
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
17 |
copying a/b to b/b |
3735 | 18 |
removing a/b |
19 |
moving a/c to b/c |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
20 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3735 | 21 |
(branch merge, don't forget to commit) |
3748
7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3735
diff
changeset
|
22 |
a/* b/a b/b b/c |
3735 | 23 |
M b/a |
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
24 |
a/a |
3735 | 25 |
M b/b |
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
26 |
a/b |
3735 | 27 |
A b/c |
28 |
a/c |
|
29 |
R a/a |
|
30 |
R a/b |
|
31 |
R a/c |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
32 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3735 | 33 |
resolving manifests |
34 |
overwrite None partial False |
|
35 |
ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
36 |
b/a: local moved to a/a -> m |
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
37 |
b/b: local moved to a/b -> m |
3735 | 38 |
None: local renamed directory to b/c -> d |
39 |
getting a/c to b/c |
|
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
40 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3735 | 41 |
(branch merge, don't forget to commit) |
3748
7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3735
diff
changeset
|
42 |
a/* b/a b/b b/c |
4304
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
43 |
M b/a |
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
44 |
a/a |
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
45 |
M b/b |
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
3748
diff
changeset
|
46 |
a/b |
3735 | 47 |
A b/c |
48 |
a/c |