Status: Inkscape-Web to Git
Dear Developers,
I'm testing the new launchpad git beta with the inkscape-web branch, to give me a taste of the issues we might have moving inkscape proper.
You can find the new git branch here:
https://code.launchpad.net/~inkscape-webadmin/inkscape-web/+git/inkscape-web
Even with my 1k commits for the website, there was an error with the fast-export | fast-import method when one file 'text.svg' was moved to 'document.svg' and 'plain.svg' was moved to 'text.svg' in the same commit. The order of the move is important in the output and in this case it was wrong.
Saving the output of fast-export to a file and then editing the text by swapping the lines was enough to get it working.
There was also issues with it's end state. It thought all files had been deleted and also untracked. Adding them all back in fixed it without commit, although there were still some old files it thought had been deleted now when they had been deleted much earlier. You can see the transition commit from the link above.
There are some scripts we use in utils which will need porting and the git tree will come into effect when we upgrade the website to 1.4 and the live and staging branches are pulled up to trunk. Then I don't have to somehow transition every branch and I can turn them into git /branches/ and keep it tidy. For now the inkscape-web project will continue to be configured for bzr, but I ask people keep their branching to a minimum until the upgrade.
Maren is the only person with an open branch right now other than trunk staging and live. That'll still be accessable, but we should consider closing it one way (merge) or another (close)
Any questions about the process?
Best Regards, Martin Owens
2015-09-10 22:18 GMT+02:00 Martin Owens <doctormo@...400...>:
There was also issues with it's end state. It thought all files had been deleted and also untracked. Adding them all back in fixed it without commit, although there were still some old files it thought had been deleted now when they had been deleted much earlier. You can see the transition commit from the link above.
I cloned the new repository and didn't have any issues of this kind.
The web view does not show any commits from before the transition, but they are present in the history when cloned.
One problem with Git in general that would need additional accommodation in our processes is that it doesn't have revision numbers. There is only "git describe", which gives revision numbers since the last tag.
Regards, Krzysztof
On Sat, 2015-09-12 at 22:03 +0200, Krzysztof Kosiński wrote:
One problem with Git in general that would need additional accommodation in our processes is that it doesn't have revision numbers. There is only "git describe", which gives revision numbers since the last tag.
Yes, same issues for the inkscape-web too. But I was going to convert it to using a date based revision. Where the last commit's date is used, I don't have to worry about versions being the same id (same day commit) because I control the deployments so tightly.
Martin,
participants (2)
-
Krzysztof Kosiński -
Martin Owens