Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull-permission.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | b2ae81a7df29 |
children |
rev | line source |
---|---|
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
1 requesting all changes |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
2 adding changesets |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
3 adding manifests |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
4 adding file changes |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
5 added 1 changesets with 1 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
7 checking changesets |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
8 checking manifests |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
9 crosschecking files in changesets and manifests |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
10 checking files |
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
11 1 files, 1 changesets, 1 total revisions |