comparison 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
comparison
equal deleted inserted replaced
6874:8dc21876261e 6875:0d714a48ab53
1 adding a
2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
3 warning: detected divergent renames of a to:
4 a2
5 a1
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7 adding a
8 b
9 b: searching for copy revision for a
10 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
11 checking changesets
12 checking manifests
13 crosschecking files in changesets and manifests
14 checking files
15 4 files, 6 changesets, 4 total revisions
16 # HG changeset patch
17 # User test
18 # Date 0 0
19 # Node ID 755e75751bf67eb4378bca61987df035d90a7a06
20 # Parent 7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d
21 5
22
23 diff --git a/b b/b
24 new file mode 100644