equal
deleted
inserted
replaced
110 > hg ci -m "added "$ch |
110 > hg ci -m "added "$ch |
111 > done; |
111 > done; |
112 |
112 |
113 $ hg amend -m "updated c" |
113 $ hg amend -m "updated c" |
114 $ hg up -r 'desc("added c")' --hidden -q |
114 $ hg up -r 'desc("added c")' --hidden -q |
115 updated to hidden changeset 2b3c31fe982d |
115 updating to a hidden changeset 2b3c31fe982d |
116 (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) |
116 (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) |
117 working directory parent is obsolete! (2b3c31fe982d) |
117 working directory parent is obsolete! (2b3c31fe982d) |
118 $ echo coco > c |
118 $ echo coco > c |
119 |
119 |
120 1) when one user is different wrt base |
120 1) when one user is different wrt base |