Guest User

Untitled

a guest
May 31st, 2018
294
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.51 KB | None | 0 0
  1. $ hg init; echo a > foo; hg add foo; hg commit -m +foo
  2. $ hg book x; hg book y; echo b >> foo; hg commit -m b
  3. $ hg update x; echo c >> foo; hg commit -m c; hg glog
  4. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  5. created new head
  6. @ changeset: 2:c6d72fa6916f
  7. | tag: tip
  8. | tag: x
  9. | parent: 0:7d9c08f4e648
  10. | user: Jed Brown <jed@59A2.org>
  11. | date: Fri Jul 09 01:05:18 2010 +0200
  12. | summary: c
  13. |
  14. | o changeset: 1:46bc8d99e1f3
  15. |/ tag: y
  16. | user: Jed Brown <jed@59A2.org>
  17. | date: Fri Jul 09 01:05:14 2010 +0200
  18. | summary: b
  19. |
  20. o changeset: 0:7d9c08f4e648
  21. user: Jed Brown <jed@59A2.org>
  22. date: Fri Jul 09 01:05:10 2010 +0200
  23. summary: +foo
  24.  
  25. $ hg rebase -s y -d x; sed -i '/^[<=>].*/d' foo; hg resolve -m foo; hg rebase --continue; hg glog
  26. merging foo
  27. warning: conflicts during merge.
  28. merging foo failed!
  29. abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
  30. saved backup bundle to /tmp/c/.hg/strip-backup/46bc8d99e1f3-backup.hg
  31. @ changeset: 2:1d45d4843b59
  32. | tag: tip
  33. | tag: x
  34. | tag: y
  35. | user: Jed Brown <jed@59A2.org>
  36. | date: Fri Jul 09 01:05:14 2010 +0200
  37. | summary: b
  38. |
  39. o changeset: 1:c6d72fa6916f
  40. | user: Jed Brown <jed@59A2.org>
  41. | date: Fri Jul 09 01:05:18 2010 +0200
  42. | summary: c
  43. |
  44. o changeset: 0:7d9c08f4e648
  45. user: Jed Brown <jed@59A2.org>
  46. date: Fri Jul 09 01:05:10 2010 +0200
  47. summary: +foo
Add Comment
Please, Sign In to add comment