Re: [PATCH] git svn fetch: Create correct commit timestamp when using --localtime

2017-08-08 Thread Urs Thuermann
Junio C Hamano writes: > > Yep, seems alright. Can you apply directly? > > Been a bit preoccupied as of late. Thanks. > > Surely, I'll just add your Reviewed-by: myself ;-) OK, thanks. This will fix the bug I've reported here a week or so ago (see the References header). urs

[PATCH] git svn fetch: Create correct commit timestamp when using --localtime

2017-08-04 Thread Urs Thuermann
In parse_svn_date() prepend the correct UTC offset to the timestamp returned. This is the offset in effect at the commit time instead of the offset in effect at calling time. Signed-off-by: Urs Thuermann --- perl/Git/SVN.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a

Re: git svn fetch --localtime produces wrong commit times

2017-08-02 Thread Urs Thuermann
Urs Thuermann writes: > I could find the bug grepping through /usr/lib/git-core/git-svn, maybe > it's in GIT::SVN::Fetcher or some other GIT::SVN module. Oops, that should be "could *not* find", of course. urs

git svn fetch --localtime produces wrong commit times

2017-08-02 Thread Urs Thuermann
fd3023d616 (refs/remotes/origin/trunk) Checked out HEAD: file:///home/urs/SVN/use/trunk r162 I see wrong commit timestamps: $ git log ... commit c6b4f7aaa66650a16de67d32fb83d541b1973331 Author: Urs Thuermann Date: Wed Nov 24 00:24:13 2010 +0200 Make code p

Re: Migration from CVS to Git looses merges

2017-06-25 Thread Urs Thuermann
Andreas Schwab writes: > Merges are recognized purely by matching the commit message, and the > regexp must capture the branch name in the first subexpr. The -m option > enables some default regexps but won't match your example. You can use > -M 'Merge branch ([-\w]+)' to match it. Thanks, I t

Migration from CVS to Git looses merges

2017-06-25 Thread Urs Thuermann
I want to convert several old CVS repositories to Git. Some of these CVS repositories contain branches, which have later been merged to the main trunk. When I try to convert using cvs2git or git cvsimport the branches appear in the new git repository but they are not merged to the master branch.

Re: How to keep log history when renaming and changing simultaneously

2017-04-17 Thread Urs Thuermann
Igor Djordjevic writes: > For both cases (renaming and splitting), would using `--find-copies` > work for you? Perhaps with some low threshold value to start with, if > the default one yields no results. > > If interested, adding `--name-status` to the mix will show similarity > percentage be

How to keep log history when renaming and changing simultaneously

2017-04-17 Thread Urs Thuermann
Sometimes I need to rename and change a file in one commit. One example would be a file foo.h that begins with #ifndef FOO_H #define FOO_H which should be renamed bar.h and have the FOO_H changed to BAR_H. In subversion I would svn mv foo.h bar.h; vi bar.h; svn ci and then a s