subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: [RFC] Shelving and Checkpointing
Date Wed, 12 Jul 2017 14:59:29 GMT


> -----Original Message-----
> From: Julian Foad [mailto:julianfoad@apache.org]
> Sent: woensdag 12 juli 2017 16:38
> To: Mark Phippard <markphip@gmail.com>
> Cc: Subversion Developers <dev@subversion.apache.org>
> Subject: Re: [RFC] Shelving and Checkpointing
> 
> Mark Phippard wrote:
> > Nice to see you have gotten this far.
> >
> > I am not even sure how this behaves with git stash but what happens if
> > the patch cannot be applied cleanly?  Is the path to "fixing things"
> > relatively clear?  Like does patch just create conflicts that you
> > resolve like anything else?
> 
> It is 'svn patch' -- so it raises conflicts.

Svn patch creates reject files. It doesn't create conflicts (yet).

	Bert


Mime
View raw message