summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Applied rule #7 of git-check-ref-formatAnton Rieder2012-05-161-1/+1
| |/ | | | | | | | | | | Rule #7 of git-check-ref-format states "7. They cannot end with a dot '.'." which was not yet implemented in fast-export. This commit fixes this.
* | Add debian/gbp.conf, enabling pristine-tar.Andrey Rahmatullin2012-06-171-0/+2
| |
* | Update debian/changelog for 20120203-1.debian/20120203-1Andrey Rahmatullin2012-02-041-4/+11
| |
* | Update debian/copyright.Andrey Rahmatullin2012-02-041-2/+3
| |
* | Revert "gbp-pq refresh and rebase debian/patches"Andrey Rahmatullin2012-02-032-14/+9
| | | | | | | | This reverts commit e9fa76b47d45aa5a10aca4cc882556b0c525461b.
* | Revert "link description to README"Andrey Rahmatullin2012-02-031-1/+0
| | | | | | | | This reverts commit 25387e26be7ab51523ebda7e2ad50bba325a7637.
* | Revert "switch old deprecated sh syntax `...` to new approved $(...)"Andrey Rahmatullin2012-02-032-7/+7
| | | | | | | | This reverts commit 9f3c019a7b375933d669950c46ac02e94b08737c.
* | Update git-hg.1 for the new git-hg.Andrey Rahmatullin2012-02-031-3/+9
| |
* | Update git-hg and README.git-hg from ↵Andrey Rahmatullin2012-02-032-14/+71
| | | | | | | | https://github.com/offbytwo/git-hg/tree/b3d5dc0dd3
* | Merge branch 'upstream'Andrey Rahmatullin2012-02-033-15/+34
|\ \ | |/
| * Update documentation: The tool is no longer called hg-fast-importupstream/20120203Frej Drejhammar2012-01-271-12/+14
| |
| * Mention the author map file in the readmeFrej Drejhammar2012-01-271-0/+11
| |
| * Add usage info for the --force optionDavid Wragg2012-01-231-2/+4
| |
| * Commits with no parent need a reset command.upstream/20111220Barry Wardell2011-12-091-1/+5
| | | | | | | | | | This fixes a problem where a repository is imported incorrectly when there is a merge between two branches with no common history.
* | Merge branch 'master' into debianBarak A. Pearlmutter2011-12-041-10/+9
|\ \
| * \ Merge branch 'upstream'Barak A. Pearlmutter2011-12-041-10/+9
| |\ \ | | |/
| | * Support the case where the author field has an empty email address, i.e. it ↵Barry Wardell2011-11-261-1/+1
| | | | | | | | | | | | is of the form 'name <>'.
| | * Use hg methods to extract name and email when doing user fixupPaul O’Shannessy2011-10-181-9/+8
| | |
* | | copy git-hg upstream README.markdown to debian/README.git-hgBarak A. Pearlmutter2011-09-201-22/+26
| | |
* | | refresh debian/git-hg from git://github.com/barak/git-hg 52f95f0 bin/git-hgBarak A. Pearlmutter2011-09-121-2/+10
| | |
* | | log changesBarak A. Pearlmutter2011-09-111-0/+7
| | |
* | | packaging simplificationsBarak A. Pearlmutter2011-09-112-7/+7
| | | | | | | | | | | | | | | | | | remove unneeded mkdir. migrate some installation into dh_install script. be more .PHONY.
* | | gbp-pq refresh and rebase debian/patchesBarak A. Pearlmutter2011-09-112-9/+14
| | |
* | | Merge branch 'master' into debianBarak A. Pearlmutter2011-09-113-7/+8
|\ \ \ | |/ /
| * | switch old deprecated sh syntax `...` to new approved $(...)Barak A. Pearlmutter2011-09-112-7/+7
| | |
| * | link description to READMEBarak A. Pearlmutter2011-09-111-0/+1
| |/
* | Merge branch 'upstream' into debianBarak A. Pearlmutter2011-09-111-7/+12
|\ \ | |/
| * hg-fast-export.sh should fail if git-fast-import failsDavid Wragg2011-06-131-4/+4
| | | | | | | | | | Previously, git-fast-import could fail, and exit with a non-zero status. But the exit status of hg-fast-export.sh would not reflect this.
| * Support passing --force to git-fast-importDavid Wragg2011-06-131-4/+9
| |
* | releasing version 20110318-2debian/20110318-2Andrey Rahmatullin2011-04-251-0/+6
| |
* | Add git-hg script fromAndrey Rahmatullin2011-04-258-1/+224
| | | | | | | | | | | | https://github.com/barak/git-hg/blob/7f17439b3cb07da766c0c5ebea8ff5aeea560402/bin/git-hg Signed-off-by: Andrey Rahmatullin <wrar@wrar.name>
* | Add Recommends: git-hg.debian/20110318-1Andrey Rahmatullin2011-04-101-0/+1
| | | | | | | | Signed-off-by: Andrey Rahmatullin <wrar@wrar.name>
* | Update changelog timestamp.Andrey Rahmatullin2011-04-101-1/+1
| | | | | | | | Signed-off-by: Andrey Rahmatullin <wrar@wrar.name>
* | Update Standards-Version to 3.9.2.Andrey Rahmatullin2011-04-101-1/+1
| | | | | | | | Signed-off-by: Andrey Rahmatullin <wrar@wrar.name>
* | Change Section to 'vcs'.Andrey Rahmatullin2011-04-101-1/+1
| | | | | | | | Signed-off-by: Andrey Rahmatullin <wrar@wrar.name>
* | Initial packaging.Andrey Rahmatullin2011-04-0112-0/+182
|/ | | | Signed-off-by: Andrey Rahmatullin <wrar@wrar.name>
* Remove \" from the user string before trying to extract name and emailupstream/20110318Frej Drejhammar2011-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Frej Drejhammar <frej.drejhammar@gmail.com> Reported-by: Cole Robinson <crobinso@redhat.com> Thank's to Cole Robinson for reporting the bug and providing a fix which was adapted to this patch. The original bug report: I was recently converting a few mercurial repositories to git, and noticed certain commits had their date reset to Jan 1 1970. An example repo: http://hg.fedorahosted.org/hg/virt-manager An example commit: http://hg.fedorahosted.org/hg/virt-manager/rev/41182500ddef After some poking, it seems the culprit was that the "author:" was surrounded by quotation marks
* The "verifying branch" message is not very interestingDavid Wragg2010-09-291-2/+0
| | | | Particularly if the repo has hundreds of branches.
* Simplify handling of parents of exported commitDavid Wragg2010-09-291-82/+32
| | | | | | | | | | The previous code did an awful lot of work to infer the parents of an exported commit, incorporating information from many sources. But there were multiple bugs in this scheme, sometimes resulting in merge commits with two parents pointing to the same commit object. Instead, use a much more straightforward process of mapping the parents stored in hg.
* Maintain backwards compatibility for ui setupRocco Rutte2009-05-251-2/+5
| | | | Signed-off-by: Rocco Rutte <pdmef@gmx.net>
* Update to work with mercurial ui refactoringsRocco Rutte2009-05-141-1/+2
| | | | Signed-off-by: Rocco Rutte <pdmef@gmx.net>
* hg-fast-export: Compare HG revisions when mergingMatthias Urlichs2009-02-231-2/+4
| | | | | | | | | | | | | | | | | | hg-fast-export uses hg's branch order (from the log) when merging, this is a problem. Consider the case: HG repo A has revisions 1-10. Repository B is cloned from that. Subsequently, A adds revision 11, and B adds a different change which also has revision 11. If B now pulls from A, A's rev11 will have the number 12; if A then pulls from B, the reverse also holds. So the logs are different even though they contain the exact same changes. hg-fast-export will thus create different git repositories for A and B, even though the contents are identical for all practical purposes. In particular, the repos would be identical if A and B had used git from the beginning. To fix that, compare HG revisions instead of log positions.
* hg-fast-export: Support branches without parentsRocco Rutte2009-01-271-7/+14
| | | | | | | | | Previously we fed the full revision only for the first one and deltas for all following including branches being forked off. This doesn't work with branches that are forked from revision 0. In case such a branch is found, we now also feed the full revision. Signed-off-by: Rocco Rutte <pdmef@gmx.net>
* hg-fast-export: Point out that only local repos are supportedFrej Drejhammar2009-01-161-0/+4
| | | | Signed-off-by: Frej Drejhammar <frej.drejhammar@gmail.com>
* hg-fast-export: Update todo now that tag movement is supportedRocco Rutte2008-12-301-18/+1
| | | | Signed-off-by: Rocco Rutte <pdmef@gmx.net>
* Merge branch 'from-jmcmullan' into developFrej Drejhammar2008-12-204-20/+40
|\ | | | | | | | | Conflicts: hg-fast-export.py
| * hg export: Support tag movementJason S. McMullan2008-12-114-20/+40
| | | | | | | | | | | | | | | | | | | | HG tag movement is now supported with this patch. This patch creates a .git/hg2git-mapping file, which maps HG revision numbers to HG hashes. Combined with the .git/hg2git-marks file, which maps HG revisions to GIT hashes, we can now reprocess all tags at the end of each hg export operation.
* | hg-fast-export: add option to track remote branches under a custom namespaceFabrizio Chiarello2008-12-203-3/+17
| | | | | | | | | | | | | | Add -o, --origin <name> to allow user to set a namespace used when importing remote branches. Signed-off-by: Fabrizio Chiarello <ponch@autistici.org>
* | hg2git: Update copyrights and maintainership information.Rocco Rutte2008-11-256-5/+7
|/ | | | Signed-off-by: Rocco Rutte <pdmef@gmx.net>
* hg-fast-export: Make default branch customizableFabrizio Chiarello2008-09-193-2/+13
| | | | | | | Add -M, --default-branch <branch_name> to allow user to set the default branch where to pull into Signed-off-by: Fabrizio Chiarello <ponch@autistici.org>
View Lorry Controller Status