Mercurial > evolve
comparison tests/test-split.t @ 4410:8087e9a0f902 stable
split: make sure hg split preserve the phase of splitting cset (issue6048)
Before this patch, while splitting we were not taking the phase
of splitting cset into account. By default new commits would
have draft changes. As we know there can two possible phases
i.e draft and secret in rewriting csets thing, so this adds
the handling of secret phase (as default is draft)
Changes in test file reflect the added behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 02 Mar 2019 01:43:14 +0530 |
parents | 2a593d8f07e7 |
children | 8ff5e557432a |
comparison
equal
deleted
inserted
replaced
4409:2a593d8f07e7 | 4410:8087e9a0f902 |
---|---|
1183 created new head | 1183 created new head |
1184 (consider using topic for lightweight branches. See 'hg help topic') | 1184 (consider using topic for lightweight branches. See 'hg help topic') |
1185 continue splitting? [Ycdq?] c | 1185 continue splitting? [Ycdq?] c |
1186 | 1186 |
1187 $ hg glog --git -p | 1187 $ hg glog --git -p |
1188 @ 3:1f8c09b13fa2 split2 (draft) | 1188 @ 3:1f8c09b13fa2 split2 (secret) |
1189 | diff --git a/c b/c | 1189 | diff --git a/c b/c |
1190 | new file mode 100644 | 1190 | new file mode 100644 |
1191 | --- /dev/null | 1191 | --- /dev/null |
1192 | +++ b/c | 1192 | +++ b/c |
1193 | @@ -0,0 +1,1 @@ | 1193 | @@ -0,0 +1,1 @@ |
1194 | +c | 1194 | +c |
1195 | | 1195 | |
1196 o 2:bcba06966846 split1 (draft) | 1196 o 2:bcba06966846 split1 (secret) |
1197 | diff --git a/b b/b | 1197 | diff --git a/b b/b |
1198 | new file mode 100644 | 1198 | new file mode 100644 |
1199 | --- /dev/null | 1199 | --- /dev/null |
1200 | +++ b/b | 1200 | +++ b/b |
1201 | @@ -0,0 +1,1 @@ | 1201 | @@ -0,0 +1,1 @@ |