[Kde-scm-interest] svn move without history

[Thiago Macieira]

Em Quinta-feira 11. Março 2010, às 07.23.53, Torgny Nyblom escreveu:
> On Thursday 11 March 2010 16.16.53 Thiago Macieira wrote:
> > Em Quinta-feira 11. Março 2010, às 06.59.24, Torgny Nyblom escreveu:
> > > On Thursday 11 March 2010 14.32.32 Andreas Pakulat wrote:
> > > > On 11.03.10 14:04:08, Torgny Nyblom wrote:
> > > > > Hi,
> > > > > 
> > > > > When converting kdepim[libs] I found a problem I need to address.
> > > > > 
> > > > > There is a submodule that began life in a separate branch which was
> > > > > later merged without svn history. This should be handled by
> > > > > manually specifying the branch in a rule (?), but how do I make
> > > > > this code end up in the correct subfolder?
> > > > > 
> > > > > That is I have:
> > > > > 
> > > > > Branch A/Submodule/files
> > > > > Trunk/
> > > > > 
> > > > > Which became
> > > > > 
> > > > > Trunk/Submodule/files
> > > > > 
> > > > > But with the manual branch rule I get:
> > > > > 
> > > > > master/files
> > > > > 
> > > > > Should have gotten
> > > > > 
> > > > > master/Submodule/files
> > > > 
> > > > As far as I understand there's no way to _create_ history that
> > > > doesn't exist in Svn. So you cannot create a relation between
> > > > master/Submodule and brancha/submodule if it wasn't svn cp'ed, but
> > > > instead was svn add'ed. However in master's history you should see
> > > > those files already and that they were added.
> > > > 
> > > > To keep the history of brancha/submodule you'll have to create a
> > > > separate repository.
> > > 
> > > Ok, thanks for that.
> > > 
> > > But how do I get the files (in the separate branch) into the correct
> > > subdir?
> > 
> > You can't create history that doesn't exist in SVN, that includes getting
> > files into directories that they aren't in.
> 
> Well I wan't to import the files into the same directory as they exit in
> SVN. But my rules add them to the root.

Then do it. Write the rule that matches the root of the import, such that the 
rest of the SVN path is the Git path you want the files to be in.


-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20100311/d6500a2f/attachment.sig