equal
deleted
inserted
replaced
58 $ echo c > c |
58 $ echo c > c |
59 $ hg commit -Amc |
59 $ hg commit -Amc |
60 adding c |
60 adding c |
61 $ cd ../blackboxtest2 |
61 $ cd ../blackboxtest2 |
62 $ hg pull |
62 $ hg pull |
63 pulling from $TESTTMP/blackboxtest (glob) |
63 pulling from $TESTTMP/blackboxtest |
64 searching for changes |
64 searching for changes |
65 adding changesets |
65 adding changesets |
66 adding manifests |
66 adding manifests |
67 adding file changes |
67 adding file changes |
68 added 1 changesets with 1 changes to 1 files |
68 added 1 changesets with 1 changes to 1 files |
83 |
83 |
84 $ mv .hg/blackbox.log .hg/blackbox.log- |
84 $ mv .hg/blackbox.log .hg/blackbox.log- |
85 $ mkdir .hg/blackbox.log |
85 $ mkdir .hg/blackbox.log |
86 $ hg --debug incoming |
86 $ hg --debug incoming |
87 warning: cannot write to blackbox.log: * (glob) |
87 warning: cannot write to blackbox.log: * (glob) |
88 comparing with $TESTTMP/blackboxtest (glob) |
88 comparing with $TESTTMP/blackboxtest |
89 query 1; heads |
89 query 1; heads |
90 searching for changes |
90 searching for changes |
91 all local heads known remotely |
91 all local heads known remotely |
92 changeset: 2:d02f48003e62c24e2659d97d30f2a83abe5d5d51 |
92 changeset: 2:d02f48003e62c24e2659d97d30f2a83abe5d5d51 |
93 tag: tip |
93 tag: tip |
102 description: |
102 description: |
103 c |
103 c |
104 |
104 |
105 |
105 |
106 $ hg pull |
106 $ hg pull |
107 pulling from $TESTTMP/blackboxtest (glob) |
107 pulling from $TESTTMP/blackboxtest |
108 searching for changes |
108 searching for changes |
109 adding changesets |
109 adding changesets |
110 adding manifests |
110 adding manifests |
111 adding file changes |
111 adding file changes |
112 added 1 changesets with 1 changes to 1 files |
112 added 1 changesets with 1 changes to 1 files |
131 $ hg strip tip |
131 $ hg strip tip |
132 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
132 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
133 saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob) |
133 saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob) |
134 $ hg blackbox -l 6 |
134 $ hg blackbox -l 6 |
135 1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip |
135 1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip |
136 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg (glob) |
136 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg |
137 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated base branch cache in * seconds (glob) |
137 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated base branch cache in * seconds (glob) |
138 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote base branch cache with 1 labels and 2 nodes |
138 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote base branch cache with 1 labels and 2 nodes |
139 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob) |
139 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob) |
140 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 |
140 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 |
141 |
141 |