Mercurial > hg
view tests/test-update-reverse.t @ 25665:dc05a10e1e45 stable
archive: don't assume '.' is being archived for changessincelatesttag
Hardcoding '.' is wrong, and yielded strange results when archiving old
revisions. For example, when archiving the cset that adds the signature to 3.4
(c48850339988), the resulting value was previously 51 (the number of commits on
stable between 3.4 and today), even though it was a direct descendant of a tag,
with a {latesttagdistance} of 2. This still includes all other _ancestor_ paths
not included in {latesttag}.
Note that archiving wdir() currently blows up several lines above this when
building the 'base' variable. Since wdir() isn't documented, ignore that it
needs work to handle wdir() here for now.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 25 Jun 2015 21:16:47 -0400 |
parents | cb15835456cb |
children | bd625cd4e5e7 |
line wrap: on
line source
$ hg init $ touch a $ hg add a $ hg commit -m "Added a" $ touch main $ hg add main $ hg commit -m "Added main" $ hg checkout 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 'main' should be gone: $ ls a $ touch side1 $ hg add side1 $ hg commit -m "Added side1" created new head $ touch side2 $ hg add side2 $ hg commit -m "Added side2" $ hg log changeset: 3:91ebc10ed028 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added side2 changeset: 2:b932d7dbb1e1 parent: 0:c2eda428b523 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added side1 changeset: 1:71a760306caf user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added main changeset: 0:c2eda428b523 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added a $ hg heads changeset: 3:91ebc10ed028 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added side2 changeset: 1:71a760306caf user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added main $ ls a side1 side2 $ hg update --debug -C 1 resolving manifests branchmerge: False, force: True, partial: False ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf side1: other deleted -> r removing side1 side2: other deleted -> r removing side2 updating: side2 2/3 files (66.67%) main: remote created -> g getting main updating: main 3/3 files (100.00%) 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ ls a main