On Wed, 22 Jun 2011, Arian Kuschki wrote:
hg summary shows parent: 1560:e181c9cf318e tip[...] How can I diff my local version against tip? Sorry am more of a git user.
[Later] On Wed, 22 Jun 2011, Arian Kuschki wrote:
On 22 June 2011 15:44, Andrew Hills wrote:On Wed, Jun 22, 2011 at 9:32 AM, Arian Kuschki wrote:How can I diff my local version against tip?Check out tip: hg clone http://hg.suckless.org/dwm Then diff: diff /path/to/your/dwm.c /path/to/tip/dwm.cyeah, I guess I was being stupid there.. I was looking for something analogous to git diff, but obviously this works and is very simple, thanks.
Err. Perhaps Andrew trimmed too much context. Since you already have an hg repo, it's much simpler to just run `hg diff`.
Even if you wanted to diff against the latest version from the hg.suckless.org repo, you still shouldn't have to reclone the whole thing:
hg pull¹ hg diff -r tip -- Best, Ben¹: Since you mentioned being more of a git user, keep in mind that 'pull' and 'fetch' are reversed in git and mercurial:
git fetch = fetch the changes from the remote repo ("fetch" = retrieve)
git pull = git fetch + git merge ("pull" = fetch and merge the changes into the
branch)
hg pull = pull the changes from the remote repo ("pull" = retrieve)
hg fetch = hg pull + hg update (differs depending on whether new branch
head found)
