tests/test-copy2.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Tue, 18 Dec 2007 14:11:13 -0600
changeset 5664 da72b4d24797
parent 4833 fc8b3e7cbf6b
child 5762 c2a21fe60994
permissions -rw-r--r--
Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).

# should fail - foo is not managed
foo: not copying - file is not managed
abort: no files to copy
? foo
# dry-run; print a warning that this is not a real copy; foo is added
foo has not been committed yet, so no copy data will be stored for bar.
A foo
# should print a warning that this is not a real copy; bar is added
foo has not been committed yet, so no copy data will be stored for bar.
A bar
# should print a warning that this is not a real copy; foo is added
bar has not been committed yet, so no copy data will be stored for foo.
A foo
# dry-run; should show that foo is clean
C foo
# should show copy
A bar
  foo
# shouldn't show copy
# should match
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
# should not be renamed
bar not renamed
# should show copy
M bar
  foo
# should show no parents for tip
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      69      0       1 6ca237634e1f 000000000000 000000000000
     1        69       6      1       2 7a1ff8e75f5b 6ca237634e1f 000000000000
     2        75      82      1       3 243dfe60f3d9 000000000000 000000000000
# should match
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
     1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
# should show no copies
# copy --after on an added file
A baz
  bar
# foo was clean:
C foo
# but it's considered modified after a copy --after --force
M foo
  bar