search for: reposurgeon

Hi Eric, One corner case I ran across when building from a reposurgeon-generated tree is that .gitignore files do not seem to be generated when a directory is created at the same time as its svn:ignore property is set. In NUT, this manifests itself in r3109: http://trac.networkupstools.org/projects/nut/changeset/3109 Trac doesn't show it there, but scripts/avahi...

There is now a public reposurgeon repository at: git at gitorious.org:reposurgeon/reposurgeon.git I've tagged 2.0pre9 there, for two purposes: * Charles can verify that I've solved the missing-files problem. * Hartmut can rework the few of his patches I didn't merge into reposurgeon. Charles, our next and final cha...

...couple of years of investigations and testing from Charles! The constraints are: - no loss of any bit of our source code history, - adapt meta information and history to fit git approach, and fit the point above. As for the documentation revamp and Asciidoc, the solution came from Eric: his tool (reposurgeon <https://gitorious.org/reposurgeon>) found a good testbed for improvements with NUT <https://gitorious.org/reposurgeon/nut-conversion>, over the past year. and Charles has been an ideal partner for working on these improvements (quoting Eric). Thanks again Charles and Eric! In the end,...

This is a consolidated reply to your four most recent emails. > I am trying to leverage reposurgeon to automate the process of finding merge > points, and I seem to be spinning my wheels. Can you provide an example of how > you are searching for merges? Not a working one, yet. That code is buggy. It's my next thing to work on. >reposurgeon% merge (apcsmart-dev) >reposurgeon: :...

Well, that wasn't as nasty as I feared it would be. Turns out that in the general case it's possible to partition a mixed-branch revision into branch cliques and generate multiple import-stream commits, one for each affected branch. We lose only if the split commit is the source of a later directory copy; I have a check for that that says, basically, "if you see this fatal error,

...anch-rename overwrites that were doing this - turns out I was trying to remove cvs2svn-generated junk commits too soon and in the process deleting critical branch links. I've uploaded a new tarball to http://www.catb.org/esr/nut-conversion/nut-conversion.tar.gz with the 2.0-pre3 version of reposurgeon in it. That leaves two remaining issues. 1. Exactly what *is* the right way to handle branch copies that re-target an existing branch name? 2. Branch merge detection. -- <a href="http://www.catb.org/~esr/">Eric S. Raymond</a> Sometimes the law defends plunder and partic...

...Eric S. Raymond might have suggested this when he was going through the old SVN commits, but even if not, I think it will make things clearer. Eric also suggests using a VCS-agnostic "action stamp" format to refer to commits, but I think it's a little verbose, and at the moment, only reposurgeon can parse them (specifically, Trac and gitk are blissfully unaware of them). I have a patch for reposurgeon that tries to address the readability issue - more on that later. From the reposurgeon manual: > An action stamp is an RFC3339 timestamp, followed by a '!', followed by a committ...

(Copied to Dave Hart at the NTP project, who's interested in the code's progress for non-NUTty reasons. Dave, the background is that I'm doing a trial conversion of the Network UPS Tools repo.) First, repostreamer per se is dead. As it evolved it kept pulling in more bits of code from reposurgeon until I said "screw it!" and merged the repostreamer logic in as a reposurgeon input stage. The NUT repo has some *strange* quirks. They seem to be consequences of a cvs2svn lift in the past; this is...normal. All that stuff will get cleaned up and untangled by the time I'm done....

I have created a git repository for the three metadata files used in the NUT-UPS conversion. The purpose of this is to allow Charles to edit the lift script. The repository is at git at gitorious.org:reposurgeon/nut-conversion.git This supplements the reposurgeon 2.0pre repository at git at gitorious.org:reposurgeon/reposurgeon.git Here is the current state of play: 1. reposurgeon is now creating merge links from directory-copy information, and gets both of the problem cases right that we previously...

I think this trunk-to-branch interior merge should be clean, but the merge logic correctly identifies some missing files in the reposurgeon output (checked in -pre7 and -pre4). They are in SVN on that branch, though (ignoring .gitignore for the time being). I only see one java file in scripts/java/jNut/src/main/java/org/networkupstools/jnut/ from reposurgeon. http://trac.networkupstools.org/projects/nut/browser/branches/windows_port/...

...base commits could turn out to be wrong at this late date? Well, not so much "wrong" perhaps, but incomplete. The apparmor branch presented a case I'd never seen before. Explanation in the log comment. The conversion metadata repository continues to be at git at gitorious.org:reposurgeon/nut-conversion.git This supplements the reposurgeon 2.0pre repository at git at gitorious.org:reposurgeon/reposurgeon.git -- <a href="http://www.catb.org/~esr/">Eric S. Raymond</a> Our society won't be truly free until "None of the Above" is always an op...

I've pushed 2.10pre to git at gitorious.org:reposurgeon/reposurgeon.git and there's a new version of the conversion metadata at git at gitorious.org:reposurgeon/nut-conversion.git I'm not entirely happy with the branch link deduction, but I think this is the best we're going to do without manual intervention to break some harmless but...

I am pleased to be able to report that reposurgeon's Subversion dump stream parser is now working well enough to produce a live git repo from the NUT history up to r3364. This didn't happen easily. The NUT repo is a wonderful test case, and by that I mean it was a stone bitch to get the stream parser to handle it. One class of problems...

...git-svn does, # Known problems: # 1. Merge code isn't working. # 2. The first Eaton_SDK commit after the deleteall should have a link # back to trunk. The commit "Moving branches/Development into trunk." # (2006-02-16T13:31:43Z!clepple+nut at gmail.com) is a deleteall in # reposurgeon's translation, but in the git-svn conversion and original SVN # repository that commit is a no-op (file-wise) that connects/renames the # old branches/Development with the new trunk. Both instances of a general # problem: I don't have rules for when I should be generating merge #...

...hon harness and replay the repo history. The problem with this is that it was hideously slow - your 3.3K commits took over 8 hours to process. I'm now working on a parser for Subversion dumpfiles. This approach - use svnsync to grab the history, use svnadmin dump to turn it into a dumpfile, reposurgeon interprets the dumpfile - is much, *much* faster. A full read takes about 10 minutes. Unfortunately, though my parser works fine on a dozen test repos, it crashes during postprocessing on yours. Weird combinations of stream operations and Unicode in the comments are two issues. I'm working o...

Argh! habits are hard to change. I've fixed the message again on the server, to satisfy the git format... Arnaud -- Linux / Unix Expert R&D - Eaton - http://powerquality.eaton.com Network UPS Tools (NUT) Project Leader - http://www.networkupstools.org/ Debian Developer - http://www.debian.org Free Software Developer - http://arnaud.quette.free.fr/ 2012/1/23 Arnaud Quette <aquette

...ecent active branch. The older windows_port ones were developed in SVN, and the merge commits did not properly record which changes from trunk/ were incorporated into the branch. Therefore, they could not be merged back into trunk/master without potentially losing information. I kept them after the reposurgeon SVN-to-Git conversion, but they are probably not useful anymore. > The Windows builder looks like turned off, am I right that it is not available currently and where were no builds after version 2.6.5-6? If you mean the Windows builder in Buildbot, it never completely worked. I believe that th...

...s_port branch got rebased, but since it has merge commits, it is a bit of a mess. > > I see that. I has also seen that many windows dedicated branches exist. The original Git windows_port branch in networkupstools/nut-archive should match the state of the SVN branch. That was converted with reposurgeon, and the SVN merges were turned into proper Git merges. If you want a clean starting point that also includes history, that would be my suggestion. Fred's later commits (as well as your two most recent commits) could be cherry-picked from the windows_port_2013-11-13 branch, since that branch c...

2014/1/15 Charles Lepple <clepple at gmail.com>: > Emilien, > > just saw your commit in Buildbot for testing some Windows changes. That's great that someone is working on this again! > We have had a few users ask for updates to the 2.6.5+ version of NUT for Windows. I am just fixing some bugs and implementing some minor windows-specific features. > The problem is that

Hi, I think it would be easier to understand why you want this if you had a use case for having an svnsync clone. Aside from backing up the repository, it seems like a fairly useless thing: you can't do local commits and then upstream them and you can't do If you want the complete history of the repository, then a git clone of the git-svn mirror will give you this very cheaply and with