Hi, Philip,
Von: Philip Martin [mailto:philip.mar...@wandisco.com]
Markus Schaber writes:
>>> Can you describe in detail how the tree conflict came about?
>>
>> I tried to create a self-contained example, but it seems that, in
>> those examples, the conflict comes out differently, I cannot get
Markus Schaber writes:
>> Can you describe in detail how the tree conflict came about?
>
> I tried to create a self-contained example, but it seems that, in
> those examples, the conflict comes out differently, I cannot get the
> tree conflict to appear.
I added an example to the issue:
http://
Hi, Stefan,
Von: Stefan Sperling [mailto:s...@elego.de]
> As given your example is a bit hard to follow because there are multi-layer
> operations involved. I am not sure how to interpret the replacement. What did
> the directory look like before it was replaced?
> Is this during merge or upda
On Thu, Feb 02, 2012 at 10:27:23AM +, Markus Schaber wrote:
> > That can be done. It requires reworking how the 'revert' operation in
> > libsvn_wc processes its arguments. We'd need to pass it a list, rather than
> > a single path and adapt the code to handle this properly.
> > This implies
Hi, Stefan,
Von: Stefan Sperling [mailto:s...@elego.de]
> On Thu, Feb 02, 2012 at 08:24:47AM +, Markus Schaber wrote:
> > I did create issue http://subversion.tigris.org/issues/show_bug.cgi?id=4109
> > for this case.
> Thanks!
> > My personal wish would be that operations like revert and c
On Thu, Feb 02, 2012 at 08:24:47AM +, Markus Schaber wrote:
> I did create issue http://subversion.tigris.org/issues/show_bug.cgi?id=4109
> for this case.
Thanks!
> My personal wish would be that operations like revert and commit work
> for all constellations even with "--depth=empty" if we
Hi, Stefan,
Von: Stefan Sperling [mailto:s...@elego.de]
On Wed, Feb 01, 2012 at 03:27:13PM +, Markus Schaber wrote:
> > I have a directory foo with tree conflict: local add of foo and a file
> > foo/bar, and then an update trying to add the same foo and foo/bar. Now, I
> > try to revert us
On Wed, Feb 01, 2012 at 03:27:13PM +, Markus Schaber wrote:
> Hi,
>
> I have a directory foo with tree conflict: local add of foo and a file
> foo/bar, and then an update trying to add the same foo and foo/bar. Now, I
> try to revert using SharpSVN, which internally calls svn_client_revert_2
Hi,
I have a directory foo with tree conflict: local add of foo and a file foo/bar,
and then an update trying to add the same foo and foo/bar. Now, I try to revert
using SharpSVN, which internally calls svn_client_revert_2(). I give the path
of the directory and the file, and a depth of "files"
