[PATCH 11 of 12 V2] bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Sun Sep 22 09:05:37 CDT 2013
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1379858556 -32400
# Sun Sep 22 23:02:36 2013 +0900
# Node ID 4e2e9a668f1437dbdbc4ac0baa0ace7c5d63df83
# Parent 42fa20a5628f09cfd4f997dcfa7682874758db1c
bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -436,3 +436,107 @@
remote: *2 incoming bookmarks, 1 outgoing bookmarks (glob)
$ cd ..
+
+Test to show result of bookmarks comparision with detailed information
+
+ $ mkdir bmcomparison
+ $ cd bmcomparison
+
+ $ hg init source
+ $ hg -R source debugbuilddag '+2*2*3*4'
+ $ hg -R source log -G --template '{rev}:{node|short}'
+ o 4:e7bd5218ca15
+ |
+ | o 3:6100d3090acf
+ |/
+ | o 2:fa942426a6fd
+ |/
+ | o 1:66f7d451a68b
+ |/
+ o 0:1ea73414a91b
+
+ $ hg -R source bookmarks -r 0 SAME
+ $ hg -R source bookmarks -r 0 ADV_ON_REPO1
+ $ hg -R source bookmarks -r 0 ADV_ON_REPO2
+ $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO1
+ $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO2
+ $ hg -R source bookmarks -r 1 DIVERGED
+
+ $ hg clone -U source repo1
+ $ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1
+ $ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1
+ $ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1
+ $ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED
+ $ hg -R repo1 -q --config extensions.mq= strip 4
+ $ hg -R repo1 log -G --template '{node|short} ({bookmarks})'
+ o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED)
+ |
+ | o fa942426a6fd (ADV_ON_REPO1)
+ |/
+ | o 66f7d451a68b (ADD_ON_REPO1 DIVERGED)
+ |/
+ o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME)
+
+
+ $ hg clone -U source repo2
+ $ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2
+ $ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2
+ $ hg -R repo2 bookmarks -f -r 2 DIVERGED
+ $ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2
+ $ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED
+ $ hg -R repo2 -q --config extensions.mq= strip 3
+ $ hg -R repo2 log -G --template '{node|short} ({bookmarks})'
+ o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED)
+ |
+ | o fa942426a6fd (DIVERGED)
+ |/
+ | o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2)
+ |/
+ o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME)
+
+
+ $ hg -R repo1 incoming -B repo2
+ comparing with repo2
+ searching for changed bookmarks
+ ADD_ON_REPO2 66f7d451a68b (-) added remotely
+ ADV_ON_REPO1 1ea73414a91b (B) advanced locally
+ ADV_ON_REPO2 66f7d451a68b (-) advanced remotely
+ DIFF_ADV_ON_REPO1 1ea73414a91b (B) advanced locally
+ DIFF_ADV_ON_REPO2 e7bd5218ca15 (?) changed
+ DIFF_DIVERGED e7bd5218ca15 (?) changed
+ DIVERGED fa942426a6fd (@) diverged
+ $ hg -R repo1 outgoing -B repo2
+ comparing with repo2
+ searching for changed bookmarks
+ ADD_ON_REPO1 66f7d451a68b (B) added locally
+ ADD_ON_REPO2 (B) deleted locally, perhaps
+ ADV_ON_REPO1 fa942426a6fd (-) advanced locally
+ ADV_ON_REPO2 1ea73414a91b (B) advanced remotely
+ DIFF_ADV_ON_REPO1 6100d3090acf (-) advanced locally
+ DIFF_ADV_ON_REPO2 1ea73414a91b (B) changed
+ DIFF_DIVERGED 6100d3090acf (B) changed
+ DIVERGED 66f7d451a68b (B) diverged
+
+ $ hg -R repo2 incoming -B repo1
+ comparing with repo1
+ searching for changed bookmarks
+ ADD_ON_REPO1 66f7d451a68b (-) added remotely
+ ADV_ON_REPO1 fa942426a6fd (-) advanced remotely
+ ADV_ON_REPO2 1ea73414a91b (B) advanced locally
+ DIFF_ADV_ON_REPO1 6100d3090acf (?) changed
+ DIFF_ADV_ON_REPO2 1ea73414a91b (B) advanced locally
+ DIFF_DIVERGED 6100d3090acf (?) changed
+ DIVERGED 66f7d451a68b (@) diverged
+ $ hg -R repo2 outgoing -B repo1
+ comparing with repo1
+ searching for changed bookmarks
+ ADD_ON_REPO1 (B) deleted locally, perhaps
+ ADD_ON_REPO2 66f7d451a68b (B) added locally
+ ADV_ON_REPO1 1ea73414a91b (B) advanced remotely
+ ADV_ON_REPO2 66f7d451a68b (-) advanced locally
+ DIFF_ADV_ON_REPO1 1ea73414a91b (B) changed
+ DIFF_ADV_ON_REPO2 e7bd5218ca15 (-) advanced locally
+ DIFF_DIVERGED e7bd5218ca15 (B) changed
+ DIVERGED fa942426a6fd (B) diverged
+
+ $ cd ..
More information about the Mercurial-devel
mailing list