You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Dmitry <cr...@yahoo.com> on 2004/05/25 15:43:13 UTC
Better merge support
Hi!
I have a question about post-1.0 features and their priorities.
One thing, I am interesting about, is a "Better merge support". This feature is
scheduled after 1.0 release. However, there is no corresponding issue in issuezilla.
Do you intend to implement this in the nearest feature?
Yes, Subversion does merge a little better than CVS, but nevertheless it is tricky
and leads to errors. IMHO, this feature is very important for collaborative work.
It would be great if you could set higher priority to the subj.
Thanks,
Dmitry Kulagin
__________________________________
Do you Yahoo!?
Friends. Fun. Try the all-new Yahoo! Messenger.
http://messenger.yahoo.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Better merge support
Posted by kf...@collab.net.
Dmitry <cr...@yahoo.com> writes:
> I have a question about post-1.0 features and their priorities.
>
> One thing, I am interesting about, is a "Better merge support". This
> feature is scheduled after 1.0 release. However, there is no
> corresponding issue in issuezilla. Do you intend to implement this
> in the nearest feature?
> Yes, Subversion does merge a little better than CVS, but
> nevertheless it is tricky and leads to errors. IMHO, this feature is
> very important for collaborative work.
We agree it's important, but need to focus on one thing at a time.
We don't have an issue filed for it because it is likely composed of
several sub-issues, and until we figure out more about the feature's
requirements, it's hard to file an issue. But we're not going to
forget about it, don't worry :-).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Better merge support
Posted by Chia-liang Kao <cl...@clkao.org>.
On Wed, May 26, 2004 at 11:37:00AM -0500, kfogel@collab.net wrote:
> Chia-Liang, can you point us to canonical home page and documentation
> for svk? I'd just Google, but last time I tried that I got confused
> about the project layout and locating primary sources, etc... Maybe I
> just missed something obvious?
It's at http://svk.elixus.org/ (and on the project_links page of Subversion!)
The merge features are described in
http://svk.elixus.org/index.cgi?MergeFeatures
You might also want to skim the tutorial and the slides linked from
the home page.
Cheers,
CLK
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Better merge support
Posted by kf...@collab.net.
Chia-Liang Kao <cl...@clkao.org> writes:
> There has been history-sensitive merge support in svk handling simple
> mutual-merge case as well as real-world complicated multi-branch case.
>
> People who want the feature might want to try svk out. The current
> algorithm can be a prototype that Subverson could use in the future
> if it is considered proven.
>
> You could use the merge feature of svk with any existing Subversion
> repository.
Chia-Liang, can you point us to canonical home page and documentation
for svk? I'd just Google, but last time I tried that I got confused
about the project layout and locating primary sources, etc... Maybe I
just missed something obvious?
I would love to read about how svk works, if pointed at the right place.
Thanks,
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Better merge support
Posted by Chia-Liang Kao <cl...@clkao.org>.
There has been history-sensitive merge support in svk handling simple
mutual-merge case as well as real-world complicated multi-branch case.
People who want the feature might want to try svk out. The current
algorithm can be a prototype that Subverson could use in the future
if it is considered proven.
You could use the merge feature of svk with any existing Subversion
repository.
Cheers,
CLK
On Tue, May 25, 2004 at 08:43:13AM -0700, Dmitry wrote:
> One thing, I am interesting about, is a "Better merge support". This feature is
> scheduled after 1.0 release. However, there is no corresponding issue in issuezilla.
> Do you intend to implement this in the nearest feature?
> Yes, Subversion does merge a little better than CVS, but nevertheless it is tricky
> and leads to errors. IMHO, this feature is very important for collaborative work.
> It would be great if you could set higher priority to the subj.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org