author | Brendan Cully <brendan@kublai.com> |
Wed, 04 Oct 2006 17:04:40 -0700 | |
changeset 3259 | 1f1af9b273e8 |
parent 3155 | c82ea81d6850 |
child 3257 | c93ce7f10f85 |
permissions | -rw-r--r-- |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
checkout |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
merge |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 |
resolving manifests |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 |
overwrite None branchmerge True partial False |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 |
ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
b: remote created -> g |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
b2: remote created -> g |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
getting b |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
getting b2 |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 |
(branch merge, don't forget to commit) |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 |
blahblah |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
foo |