>>> "Arne" == Arne Babenhauserheide <[email protected]> writes:
> Uwe Brauer writes: >> git log --graph --decorate --pretty=short | git name-rev --stdin | more > … >> Resulting for example for the auctex repository in >> >> * commit eb2d64bede8587c864c3031f233a0ae87c3f3a03 (master) (HEAD, origin/master, origin/HEAD, master) >> | >> * commit 17d1a5d71f9fb6adbb90e17dbf223f3bf1e2f92a (master~153) >> |\ Merge: f9efa73 1950012 >> | * commit 1950012155d539f05c393dae3d6e93548bbc57b2 (remotes/origin/simplify-TeX-parse-error~136) >> | |\ Merge: b4ff376 4b21d3f >> So the () after the HASH indicate to which branch a commit belongs. > What happens here if I create a branch which starts at 17d1a5d. Which > branch will 17d1a5d belong to? From what I have read, https://felipec.wordpress.com/2012/05/26/no-mercurial-branches-are-still-not-better-than-git-ones-response-to-jhws-more-on-mercurial-vs-git-with-graphs/ I think 17d1a5d would belong to the new branch and to master. >> * commit eb2d64bede8587c864c3031f233a0ae87c3f3a03 (master) (HEAD, origin/master, origin/HEAD, master) >> | >> | * commit XYZ (foo) (HEAD, origin/master, origin/HEAD, master) >> |/ >> * commit 17d1a5d71f9fb6adbb90e17dbf223f3bf1e2f92a (master~153 or foo~1?) <--- this is the question I think both > What happens if origin removes the branch simplify-TeX-parse-error (as > is the common action when a github pull request is merged)? Oh this I don't know, good point. (I only use git via the hg-git plugin) Uwe _______________________________________________ Mercurial mailing list [email protected] https://www.mercurial-scm.org/mailman/listinfo/mercurial
