Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-main.t @ 5309:30a924abda75 mercurial-5.3
test-compat: back out changeset 4da1d21231ae
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 19:22:36 +0800 |
| parents | a73cdef2e33f |
| children | 88f9bbba392d 5907b495901e |
comparison
equal
deleted
inserted
replaced
| 5308:e656e9d01de4 | 5309:30a924abda75 |
|---|---|
| 92 | @@ -1,2 +1,3 @@ | 92 | @@ -1,2 +1,3 @@ |
| 93 | I am first | 93 | I am first |
| 94 | b | 94 | b |
| 95 | +I am second | 95 | +I am second |
| 96 | | 96 | |
| 97 % 2:44f360db368f added b | 97 o 2:44f360db368f added b |
| 98 | public | 98 | public |
| 99 | | 99 | |
| 100 | diff -r 9092f1db7931 -r 44f360db368f b | 100 | diff -r 9092f1db7931 -r 44f360db368f b |
| 101 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 101 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 102 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | 102 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
| 186 | 186 |
| 187 $ hg glog | 187 $ hg glog |
| 188 @ 5:4ae447c511d3 phase-divergent update to 580f2d01e52c: | 188 @ 5:4ae447c511d3 phase-divergent update to 580f2d01e52c: |
| 189 | draft | 189 | draft |
| 190 | | 190 | |
| 191 % 2:580f2d01e52c added b | 191 o 2:580f2d01e52c added b |
| 192 | public | 192 | public |
| 193 | | 193 | |
| 194 o 0:9092f1db7931 added a | 194 o 0:9092f1db7931 added a |
| 195 public | 195 public |
| 196 | 196 |