equal
deleted
inserted
replaced
79 rebasing 10:c85eff83a034 "D0" (tip) |
79 rebasing 10:c85eff83a034 "D0" (tip) |
80 |
80 |
81 check result |
81 check result |
82 |
82 |
83 $ hg debugobsolete --rev . |
83 $ hg debugobsolete --rev . |
84 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} |
84 c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
85 |
85 |
86 amend touching the diff |
86 amend touching the diff |
87 ----------------------- |
87 ----------------------- |
88 |
88 |
89 $ mkcommit E0 |
89 $ mkcommit E0 |
148 created new head |
148 created new head |
149 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
149 $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3 |
150 rebasing 17:b57fed8d8322 "H1" |
150 rebasing 17:b57fed8d8322 "H1" |
151 merging H0 |
151 merging H0 |
152 $ hg debugobsolete -r tip |
152 $ hg debugobsolete -r tip |
153 b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} |
153 b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
154 |
154 |
155 amend closing the branch should be detected as meta change |
155 amend closing the branch should be detected as meta change |
156 ---------------------------------------------------------- |
156 ---------------------------------------------------------- |
157 |
157 |
158 $ hg branch closedbranch |
158 $ hg branch closedbranch |