Re: [Python-Dev] svnmerge and added files

2008-03-20 Thread Mike Klaas
On 20-Mar-08, at 2:32 PM, Christian Heimes wrote: > Martin v. Löwis schrieb: >> It seems that recently, a number of merges broke in the sense >> that files added to the trunk were not merged into the >> 3k branch. >> >> Is that a general problem with svnmerge? Should that be >> fixed to automatica

Re: [Python-Dev] svnmerge and added files

2008-03-20 Thread Christian Heimes
Martin v. Löwis schrieb: > It seems that recently, a number of merges broke in the sense > that files added to the trunk were not merged into the > 3k branch. > > Is that a general problem with svnmerge? Should that be > fixed to automatically do a "svn add" when merging changes > that included fi

[Python-Dev] svnmerge and added files

2008-03-20 Thread Martin v. Löwis
It seems that recently, a number of merges broke in the sense that files added to the trunk were not merged into the 3k branch. Is that a general problem with svnmerge? Should that be fixed to automatically do a "svn add" when merging changes that included file additions and removals? Regards, Ma