If I have a sparse checkout of /trunk (say it has subdirectories dir1
and dir2, so I just have a working copy of /trunk/dir1), commit some
changes, switch my checkout to a branch, then try to merge the changes
I just committed, the mergeinfo property gets revisions marked with
"*" in the branch roo
On Wed, Oct 19, 2011 at 1:44 AM, Douglas Wilson
wrote:
> If I have a sparse checkout of /trunk (say it has subdirectories dir1
> and dir2, so I just have a working copy of /trunk/dir1), commit some
> changes, switch my checkout to a branch, then try to merge the changes
> I just committed, the mer
On Oct 19, 12:29 am, Johan Corveleyn wrote:
>
> Is this still the case with 1.7? Could you test that?
>
> There were a lot of merge-tracking improvements and bugfixes in 1.7,
> but I'm not sure if this particular issue has been addressed.
> Seehttp://subversion.apache.org/docs/release-notes/1.7
On Oct 19, 11:06 am, Douglas Wilson wrote:
> On Oct 19, 12:29 am, Johan Corveleyn wrote:
>
> > There were a lot of merge-tracking improvements and bugfixes in 1.7,
> > but I'm not sure if this particular issue has been addressed. See
> > http://subversion.apache.org/docs/release-notes/1.7.html#
On Thu, Oct 20, 2011 at 10:35:41AM -0700, Douglas Wilson wrote:
>
> On Oct 19, 11:06 am, Douglas Wilson wrote:
> > On Oct 19, 12:29 am, Johan Corveleyn wrote:
> >
> > > There were a lot of merge-tracking improvements and bugfixes in 1.7,
> > > but I'm not sure if this particular issue has been a
On Oct 20, 10:45 am, Stefan Sperling wrote:
>
> Which version of SVN are you running when you hit the problem
> you described in your first post? 1.6 or 1.7?
Subversion 1.7.0
On Thu, Oct 20, 2011 at 02:02:48PM -0700, Douglas Wilson wrote:
>
>
> On Oct 20, 10:45 am, Stefan Sperling wrote:
> >
> > Which version of SVN are you running when you hit the problem
> > you described in your first post? 1.6 or 1.7?
>
> Subversion 1.7.0
Ok, in that case what you are seeing is
On Oct 21, 2:10 am, Stefan Sperling wrote:
> On Thu, Oct 20, 2011 at 02:02:48PM -0700, Douglas Wilson wrote:
>
> > On Oct 20, 10:45 am, Stefan Sperling wrote:
>
> Does that make sense?
Yes, I get that.
I was using Tortoise, but retested with command line SVN:
C:\SVN\Test>svn merge -r 3:4 --dr
On Fri, Oct 21, 2011 at 10:40:54AM -0700, Douglas Wilson wrote:
>
>
> On Oct 21, 2:10 am, Stefan Sperling wrote:
> > On Thu, Oct 20, 2011 at 02:02:48PM -0700, Douglas Wilson wrote:
> >
> > > On Oct 20, 10:45 am, Stefan Sperling wrote:
> >
> > Does that make sense?
> Yes, I get that.
>
> I was
On Sat, Oct 22, 2011 at 11:25:14AM +0200, Stefan Sperling wrote:
> On Fri, Oct 21, 2011 at 10:40:54AM -0700, Douglas Wilson wrote:
> Can you please explain in detail what your sparse working copy
> configuration loko like?
Oops, "looks", not loko :)
Not sure how that typo happened. I blame vim...
On Oct 22, 2:25 am, Stefan Sperling wrote:
>
> Your reproduction recipe is incomplete.
I think I left out the import..lemme try again:
DIR=$PWD
mkdir -p $DIR/src/trunk/dir1
mkdir -p $DIR/src/trunk/dir2
mkdir -p $DIR/src/branches
touch $DIR/src/trunk/dir1/file1.txt
touch $DIR/src/trunk/dir2/fil
On Oct 22, 2:25 am, Stefan Sperling wrote:
>
> Your reproduction recipe is incomplete.
Here is (I hope) a complete reproduction:
#!/bin/ksh
# Create repo
DIR=$PWD
mkdir -p $DIR/src/trunk/dir1
mkdir -p $DIR/src/trunk/dir2
mkdir -p $DIR/src/branches
touch $DIR/src/trunk/dir1/file1.txt
touch $DIR
On Nov 1, 3:02 pm, Douglas Wilson wrote:
> On Oct 22, 2:25 am, Stefan Sperling wrote:
> > Your reproduction recipe is incomplete.
>
> I think I left out the import..lemme try again:
...snip...
It looks like this is covered by issues 4056 and 4057 and targeted for
release 1.8.
Guess I'll just
13 matches
Mail list logo
