annotate tests/test-issue1175.out @ 6875:0d714a48ab53

add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Aug 2008 18:01:03 -0500
parents
children d557749c627a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6875
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 adding a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 warning: detected divergent renames of a to:
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 a2
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 a1
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 adding a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 b
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 b: searching for copy revision for a
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
11 checking changesets
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 checking manifests
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 crosschecking files in changesets and manifests
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 checking files
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15 4 files, 6 changesets, 4 total revisions
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 # HG changeset patch
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17 # User test
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
18 # Date 0 0
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
19 # Node ID 755e75751bf67eb4378bca61987df035d90a7a06
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20 # Parent 7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
21 5
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
22
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
23 diff --git a/b b/b
0d714a48ab53 add a fix for issue 1175
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
24 new file mode 100644