[darcs-users] darcs changes messed up?

[Tommy Pettersson]

On Fri, May 06, 2005 at 01:20:21PM +0200, VMiklos wrote:
> hi
> 
> it seems that the date of a patch indicates the record time, but 'darcs 
> changes' shows the patches in the order of pulling time
> 
> this way the order of dates can be messed up:
[...] 
> this is a bug or is it a feature? :)

It's _the_ feature of darcs: patches can be applied in
any order.

I also think it's the most sensible way to order the patches
when you work with a repo.  Say you pull in a feature from one
branch and a bugfix from another, then these patches end up
last in the repos inventory.  'changes --last' will show them
to you, and 'unpull' and 'amend' will ask about them first.
It would be annoying if the bugfix patch ended up as 100th
last just because it was recorded some months ago.

I keep a BEGIN tag in my working repos, and when I sync
in changes from upstream I usually first push BEGIN and
everything after it to a _store repo, then unpull it before
I pull in the new upstream patches, and lastly pull my own
patches back.  That way I always have them last in the repo,
and any conflicts happens in my patches where it is safe to
amend them before I send them to upstream.


-- 
Tommy Pettersson <ptp at lysator.liu.se>