You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Till Maas <op...@till.name> on 2011/08/09 19:45:20 UTC
RFE: support to abort update in case of conflict
Hi,
I would like to propose to add a way to abort updates in case of an
conflict. This could be done by adding e.g. an abort command to the
interactive conflict resolution. This should transform the working copy
to the situation before the update that resulted in an conflict happend.
The reason I would like to have this is because on a project I work on
it regularly happens that one committer accidently reverts changes made
by other that result in an conflict. In this case usually the easiest
way to fix this is to (partially) revert the conflicting commit and then
update. Therefore it would be nice to be able to abort an update that
results in a conflict, wait for the other commiter to revert the
conflicting commit and update then.
Regards
Till
AW: RFE: support to abort update in case of conflict
Posted by Markus Schaber <m....@3s-software.com>.
Hi, Daniel,
Daniel Shahaf [mailto:d.s@daniel.shahaf.name]
> Till Maas wrote on Tue, Aug 09, 2011 at 19:45:20 +0200:
> > I would like to propose to add a way to abort updates in case of an
> > conflict. This could be done by adding e.g. an abort command to the
> > interactive conflict resolution. This should transform the working
> > copy to the situation before the update that resulted in an conflict
> happend.
> svn update --accept=merge
--config-option=config:helpers:diff3-cmd='kill
> $PPID' || svn cleanup
Will "svn cleanup" really revert all the already updated files back to
the original state?
Best regards
Markus Schaber
___________________________
We software Automation.
3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 |
Fax +49-831-54031-50
Email: m.schaber@3s-software.com | Web: http://www.3s-software.com
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects:
http://www.3s-software.com/index.shtml?sample_projects
Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner |
Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
Re: RFE: support to abort update in case of conflict
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
svn update --accept=merge --config-option=config:helpers:diff3-cmd='kill $PPID' || svn cleanup
Till Maas wrote on Tue, Aug 09, 2011 at 19:45:20 +0200:
> Hi,
>
> I would like to propose to add a way to abort updates in case of an
> conflict. This could be done by adding e.g. an abort command to the
> interactive conflict resolution. This should transform the working copy
> to the situation before the update that resulted in an conflict happend.
>
> The reason I would like to have this is because on a project I work on
> it regularly happens that one committer accidently reverts changes made
> by other that result in an conflict. In this case usually the easiest
> way to fix this is to (partially) revert the conflicting commit and then
> update. Therefore it would be nice to be able to abort an update that
> results in a conflict, wait for the other commiter to revert the
> conflicting commit and update then.
>
> Regards
> Till
Re: support to abort update in case of conflict
Posted by Peter Samuelson <pe...@p12n.org>.
[Bob Archer]
> Ok, isn't this just a reverse merge?
I guess you didn't read the whole thread. His initial question made it
pretty clear he's not doing a reverse merge, but asking for a new
feature for 'svn update'.
> Also, not sure why this is on the dev list... it should be on
> users@s.a.o
Because he's asking for (discussion about) a proposed new feature for
'svn update'.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
RE: support to abort update in case of conflict
Posted by Bob Archer <Bo...@amsi.com>.
> On Tue, Aug 09, 2011 at 03:55:00PM -0400, Bob Archer wrote:
> > > I would like to propose to add a way to abort updates in case of an
> conflict.
> > > This could be done by adding e.g. an abort command to the
> > > interactive conflict resolution. This should transform the working
> > > copy to the situation before the update that resulted in an conflict
> happend.
> > >
> > > The reason I would like to have this is because on a project I work
> > > on it regularly happens that one committer accidently reverts
> > > changes made by other that result in an conflict. In this case
> > > usually the easiest way to fix this is to (partially) revert the
> > > conflicting commit and then update. Therefore it would be nice to be
> > > able to abort an update that results in a conflict, wait for the other
> commiter to revert the conflicting commit and update then.
> >
> > Are you sharing working copies? I'm pretty sure that is not a supported use
> case for subversion... so requesting something change due to a non-
> supported use case isn't going to happen.
>
> No. The problem results from vim failing to reload a changed document after
> svn up. E.g.:
>
> Joe opens foo.tex with revision 1
> Jane commits revision 2 of foo.tex
> Joe updates foo.tex, but vim fails to notice.
> Joe changes something unrelated to Jane's commit and saves foo.tex in vim.
> Joe commits revision 3 of foo.tex, which contains the contents of revision 1 in
> the section Jane is working on.
> Jane changes something in her section.
> Jane updates to revision 3, but this results in a conflict.
>
> What I would like to have is that Jane can now abort the update and ask Joe
> to fix the repository contents with another commit that reverts the changes
> from revision 3 so that Jane can cleanly update after Joe commited the clean
> revision 4.
Ok, isn't this just a reverse merge?
Also, not sure why this is on the dev list... it should be on users@s.a.o
BOb
Re: support to abort update in case of conflict
Posted by Till Maas <op...@till.name>.
On Tue, Aug 09, 2011 at 03:55:00PM -0400, Bob Archer wrote:
> > I would like to propose to add a way to abort updates in case of an conflict.
> > This could be done by adding e.g. an abort command to the interactive
> > conflict resolution. This should transform the working copy to the situation
> > before the update that resulted in an conflict happend.
> >
> > The reason I would like to have this is because on a project I work on it
> > regularly happens that one committer accidently reverts changes made by
> > other that result in an conflict. In this case usually the easiest way to fix this is
> > to (partially) revert the conflicting commit and then update. Therefore it
> > would be nice to be able to abort an update that results in a conflict, wait for
> > the other commiter to revert the conflicting commit and update then.
>
> Are you sharing working copies? I'm pretty sure that is not a supported use case for subversion... so requesting something change due to a non-supported use case isn't going to happen.
No. The problem results from vim failing to reload a changed document
after svn up. E.g.:
Joe opens foo.tex with revision 1
Jane commits revision 2 of foo.tex
Joe updates foo.tex, but vim fails to notice.
Joe changes something unrelated to Jane's commit and saves foo.tex in
vim.
Joe commits revision 3 of foo.tex, which contains the contents of
revision 1 in the section Jane is working on.
Jane changes something in her section.
Jane updates to revision 3, but this results in a conflict.
What I would like to have is that Jane can now abort the update and ask
Joe to fix the repository contents with another commit that reverts the
changes from revision 3 so that Jane can cleanly update after Joe
commited the clean revision 4.
Regards
Till
RE: support to abort update in case of conflict
Posted by Bob Archer <Bo...@amsi.com>.
> I would like to propose to add a way to abort updates in case of an conflict.
> This could be done by adding e.g. an abort command to the interactive
> conflict resolution. This should transform the working copy to the situation
> before the update that resulted in an conflict happend.
>
> The reason I would like to have this is because on a project I work on it
> regularly happens that one committer accidently reverts changes made by
> other that result in an conflict. In this case usually the easiest way to fix this is
> to (partially) revert the conflicting commit and then update. Therefore it
> would be nice to be able to abort an update that results in a conflict, wait for
> the other commiter to revert the conflicting commit and update then.
Are you sharing working copies? I'm pretty sure that is not a supported use case for subversion... so requesting something change due to a non-supported use case isn't going to happen.
BOb