Mercurial > evolve

comparison tests/test-evolve-obshistory-split.t @ 5637:eed42a183d46 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 19:33:42 +0800
parents e6e92835d42d a34b5cf906c6
children 15406dfa60e1 c2c85576ddfb
comparison
equal deleted inserted replaced
5636:3f9ef377e670 5637:eed42a183d46
44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
45 adding a 45 adding a
46 adding b 46 adding b
47 diff --git a/a b/a 47 diff --git a/a b/a
48 new file mode 100644 48 new file mode 100644
49 examine changes to 'a'? 49 examine changes to 'a'? [Ynesfdaq?] y
50 (enter ? for help) [Ynesfdaq?] y
51 50
52 @@ -0,0 +1,1 @@ 51 @@ -0,0 +1,1 @@
53 +42 52 +42
54 record change 1/2 to 'a'? 53 record change 1/2 to 'a'? [Ynesfdaq?] y
55 (enter ? for help) [Ynesfdaq?] y
56 54
57 diff --git a/b b/b 55 diff --git a/b b/b
58 new file mode 100644 56 new file mode 100644
59 examine changes to 'b'? 57 examine changes to 'b'? [Ynesfdaq?] n
60 (enter ? for help) [Ynesfdaq?] n
61 58
62 created new head 59 created new head
63 continue splitting? [Ycdq?] y 60 continue splitting? [Ycdq?] y
64 diff --git a/b b/b 61 diff --git a/b b/b
65 new file mode 100644 62 new file mode 100644
66 examine changes to 'b'? 63 examine changes to 'b'? [Ynesfdaq?] y
67 (enter ? for help) [Ynesfdaq?] y
68 64
69 @@ -0,0 +1,1 @@ 65 @@ -0,0 +1,1 @@
70 +43 66 +43
71 record this change to 'b'? 67 record this change to 'b'? [Ynesfdaq?] y
72 (enter ? for help) [Ynesfdaq?] y
73 68
74 no more change to split 69 no more change to split
75 70
76 $ sync 71 $ sync
77 72