Mercurial > hg-allpaths
diff tests/groups-modern.t @ 48:00995da9c204
Implemented priorities, fixed bugs in ignoring, both should work.
Testfixes
author | Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl> |
---|---|
date | Sun, 25 Sep 2016 21:20:31 +0200 |
parents | e695060c716e |
children | 14a3ffbba22b |
line wrap: on
line diff
--- a/tests/groups-modern.t Sun Sep 25 10:22:37 2016 +0200 +++ b/tests/groups-modern.t Sun Sep 25 21:20:31 2016 +0200 @@ -250,10 +250,32 @@ But global access works $ hg --cwd $BASE pushall - HMM + pushing to */rep1 (glob) + searching for changes + abort: push creates new remote head *! (glob) + (merge or see "hg help push" for details about pushing new heads) + [255] $ hg --cwd $BASE pullall - HMM + pulling from */rep1 (glob) + searching for changes + no changes found + + pulling from */rep2 (glob) + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + (run 'hg update' to get a working copy) + + pulling from */rep3 (glob) + searching for changes + no changes found + + pulling from */rep4 (glob) + searching for changes + no changes found Finally let's test that push options work @@ -269,7 +291,7 @@ $ hg --cwd $BASE commit -m 'Br1' $ hg --cwd $BASE update default - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cat >> $BASE/file.txt << EOF > later text > EOF @@ -281,24 +303,27 @@ adding changesets adding manifests adding file changes - added 1 changesets with 1 changes to 1 files + added 3 changesets with 3 changes to 1 files (+1 heads) pushing to */rep3 (glob) searching for changes adding changesets adding manifests adding file changes - added 2 changesets with 2 changes to 2 files + added 3 changesets with 3 changes to 1 files $ hg --cwd $BASE log -T '{rev}: {desc}\n' - 4: Normal - 3: Br1 + 5: Normal + 4: Br1 + 3: In repo2 2: In repo1 1: Second 0: First $ hg --cwd $REP1 log -T '{rev}: {desc}\n' - 2: Normal + 4: Normal + 3: In repo2 + 2: Second 1: In repo1 0: First @@ -308,8 +333,8 @@ 0: First $ hg --cwd $REP3 log -T '{rev}: {desc}\n' - 2: Normal - 1: In repo1 + 3: Normal + 2: In repo2 + 1: Second 0: First -.