[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Subversion 1.5 Issue Triage

From: Paul Burba <pburba_at_collab.net>
Date: 2007-07-17 17:44:06 CEST

> -----Original Message-----
> From: Mark Phippard [mailto:markphip@gmail.com]
> Sent: Tuesday, July 17, 2007 9:53 AM
> To: dev
> Subject: Subversion 1.5 Issue Triage
> There are currently 92 issues with the 1.5 milestone. Of
> those, 68 are completed and 24 are still open. Of those 24,
> 15 of them are related to merge tracking. Not really
> surprising given Dan's recent push to create issues for all
> of the outstanding issues related to merge tracking.


I'm deep in the work for non-inheritable revision ranges and want to
finish that - see newly added issue 2839.

> Here are the 15 merge related issues. There are a few
> bite-size ones included if someone wants to help get them knocked off:
> 2754 DEFECT P2 Can't merge to target with added children
> with mergeinfo

2754 is currently assigned to me but since I'm not actively working on
it I removed myself for now. I still plan to get back to it, but in the
meantime I don't want to block someone else from grabbing it.

> 2786 DEFECT P3 Merging to out of date target can lead to
> inaccurate merge info

Not assigned to me now, but I'm planning to do it as soon as higher
priority tasks are completed.

> 2818 ENHANCE P2 Provide a 'merge' API which allows for merging of
> arbitrary revision ranges (e.g. '-c 3,5,7')
> 2820 FEATURE P2 Add APIs capable of listing "merged revisions" and
> "unmerged revisions"
> 2821 TASK P1 Improve merge algorithm used for target trees with
> child paths/differing merge info
> 2822 TASK P2 Propogate implied merge info on WC -> WC copy/move
> operations

> 2823 TASK P2 Account for merge info differences for switched
> directories when gathering merge info

The solution here is largely about non-inheritable mergeinfo, which I'm
well on the way to implementing.

> 2824 TASK P1 Handle merge info inheritance and eliding

Several times I've been tempted to call the inheritance/elision work
done...but it keeps needing tweaks, non-inheritable mergeinfo being the
latest case.

> 2826 DEFECT P2 Incorrect status reported when dir prop conflict
> occurs on a dir which also has its svn:mergeinfo prop updated

> 2827 ENHANCE P2 Handle sparsely-populated directories, or portions
> of a tree not checked out due to insufficient authz

Working on the authz aspect of this in the non-inheritable range work.

> 2828 ENHANCE P3 Handle multiple merge notifications for
> single WC items
> 2829 ENHANCE P3 Improve handling for skip notifications
> encountered during a merge
> 2830 ENHANCE P1 Improve handling for conflicts
> encountered during a merge
> 2831 DEFECT P1 Handle notifications resulting from a merge (e.g.
> skips, conflicts, multiple notifications)
> 2835 FEATURE P3 Add APIs capable of finding where change sets have
> been merged from/to

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 17 17:45:04 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.