On Tue, Oct 16, 2012 at 06:35:21PM +0200, Stefan Sperling wrote:
> Again, sticking to simple branching/merging patterns where all merges
> happen between directly related branches makes things a lot easier.
Hi again Sven,
I've looked at this some more trying to come up with a simpler solution.
I
On Wed, Oct 17, 2012 at 01:17:03PM +1100, Joshua Woodward-Clarke wrote:
> I just tried it and can confirm that I am getting the same issue.
> (I am fairly new to SVN so I may have done somthing wrong)
>
> I am running Win XP SP3.
>
> I downloaded the files and tried applying the patches.
> I trie
On Wed, Oct 17, 2012 at 12:31:22PM +0200, Stefan Sperling wrote:
> Thanks for reporting this!
Fix committed and nominated for inclusion in 1.7.8:
http://svn.apache.org/viewvc?view=revision&revision=1399174
http://svn.apache.org/viewvc?view=revision&revision=1399179
Guten Tag Justin Wu,
am Mittwoch, 17. Oktober 2012 um 16:31 schrieben Sie:
> My windows 7 is English version.
> (1) installed SlikSvn-1.7.6-x64, and it output perfectly(see attached picture)
> (2) change current system Locale to Chinese for no-unicode program.(see
> attached picture)
> (3) svn no
Am 17.10.2012 12:00, schrieb Stefan Sperling:
> On Tue, Oct 16, 2012 at 06:35:21PM +0200, Stefan Sperling wrote:
>> Again, sticking to simple branching/merging patterns where all merges
>> happen between directly related branches makes things a lot easier.
>
> Hi again Sven,
>
> I've looked at th
Am 16.10.2012 18:02, schrieb Stefan Sperling:
> On Tue, Oct 16, 2012 at 01:17:40PM +0200, Sven Uhlig wrote:
>> Below is a .bat file for creating the repo with some more conflicts that
>> we do not understand. I would be happy if someone could explain these as
>> well.
>
> Please see my remarks bel
On Wed, Oct 17, 2012 at 05:30:14PM +0200, Sven Uhlig wrote:
> > Ideally, you'd reintegrate prj1 into trunk first and then merge the
> > changes into prj2 from trunk, using a sequence such as:
>
> I guess this merge was a bad example and wrong as well. There could be
> changes that are commited to
On Wed, Oct 17, 2012 at 07:12:17PM +0200, Stefan Sperling wrote:
> You then cherry-picked this revision from prj1 into prj2, causing a commit
> that added second.txt to prj2. Let's call this changeset 'prj2@50':
>
> A second.txt (copied from, say, prj1@49)
> Mergeinfo addition: Merged prj1:4
