Q: finding parent changesents?

Thomas Arendsen Hein thomas at intevation.de
Thu Aug 11 04:34:06 UTC 2005


* Perez-Gonzalez, Inaky <inaky.perez-gonzalez at intel.com> [20050811 05:37]:
> I cloned the kernel repo (kernel.org/hg/linux-2.6)
> Added my stuff (patch here, edit there, ...)
> pulled from linux-2.6
> add/modify more stuff
> pull again
> 
> Now I want to do a diff against the baseline (linux-2.6)
> of my changes, but I am kind of lost on how to do it.
> I am guessing I have to find the parent of my branch
> with hg parents and diff against that, right?

> changeset:   5789:6a18e8b3cb51e7b30a502ee5d84f6ffcd863189c
> parent:      5753:8cca03927a991baf4e60d0ded51725fe83c8ede0
> parent:      5788:c226b932746a85bc61eab272fc76699b30c82ebb
> summary:     kvm: merge linux-2.6

Here you did not only pull linux-2.6, but you did a merge, so this
is your new baseline. changesets 5754-5788 were introduced by
pull+update, 5753 (and maybe below) were done by you again.

Do you need a diff from tip to 5790 *and* from 5753 to whatever was
your first change.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/



More information about the Mercurial mailing list