To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Breezy landing bot
- Date: 2019-10-13 16:11:08 UTC
- mfrom: (7397.2.4 ie-is-same)
- Revision ID: breezy.the.bot@gmail.com-20191013161108-imzi2dmiz7g0jzha
Add a new ``TreeEntry.is_unmodified`` method, which allows
merge to check for unmodified files without relying
on the .revision attribute that is not available for Git trees.
This fixes LCA merges for Git repositories.
Merged from https://code.launchpad.net/~jelmer/brz/ie-is-same/+merge/373715
merge to check for unmodified files without relying
on the .revision attribute that is not available for Git trees.
This fixes LCA merges for Git repositories.
Merged from https://code.launchpad.net/~jelmer/brz/ie-is-same/+merge/373715
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
notes
|
0.397.1 | 7 years ago | Jelmer Vernooij | Change root id. |
|
||
|
tests
|
0.397.1 | 7 years ago | Jelmer Vernooij | Change root id. |
|
||
.testr.conf |
6883.23.3 | 7 years ago | Jelmer Vernooij | Update testr to use local brz. | 220 bytes |
|
|
|
__init__.py |
7359.1.5 | 6 years ago | Jelmer Vernooij | Fix import. | 15.1 KB |
|
|
|
annotate.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 5.4 KB |
|
|
|
branch.py |
7380.1.1 | 6 years ago | Jelmer Vernooij | Several more fixes for git merge proposals. | 52.5 KB |
|
|
bzr-receive-pack |
0.397.1 | 7 years ago | Jelmer Vernooij | Change root id. | 453 bytes |
|
|
|
bzr-upload-pack |
0.397.1 | 7 years ago | Jelmer Vernooij | Change root id. | 438 bytes |
|
|
|
cache.py |
7336.2.1 | 6 years ago | Martin | Split non-ini config methods to bedding Functions | 33.3 KB |
|
|
|
commands.py |
7371.2.1 | 6 years ago | Jelmer Vernooij | Fix importing from remote git repositories. | 12.8 KB |
|
|
|
commit.py |
7358.13.1 | 6 years ago | Jelmer Vernooij | Drop file id roundtripping support in Git. Stashi | 8.9 KB |
|
|
|
config.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 2.3 KB |
|
|
|
dir.py |
7380.1.1 | 6 years ago | Jelmer Vernooij | Several more fixes for git merge proposals. | 27.7 KB |
|
|
|
directory.py |
7268.11.2 | 7 years ago | Jelmer Vernooij | Add purpose argument. | 1 KB |
|
|
|
errors.py |
7240.10.1 | 7 years ago | Jelmer Vernooij | Properly handle exceptions about hg extra fields. | 2.5 KB |
|
|
|
fetch.py |
7358.13.1 | 6 years ago | Jelmer Vernooij | Drop file id roundtripping support in Git. Stashi | 20.9 KB |
|
|
|
filegraph.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 4.2 KB |
|
|
|
git-remote-bzr |
7290.11.8 | 7 years ago | Jelmer Vernooij | Fix tests on Python 3. | 1.4 KB |
|
|
|
git-remote-bzr.1 |
0.397.1 | 7 years ago | Jelmer Vernooij | Change root id. | 1 KB |
|
|
|
git_remote_helper.py |
7290.11.8 | 7 years ago | Jelmer Vernooij | Fix tests on Python 3. | 6.6 KB |
|
|
|
help.py |
0.397.1 | 7 years ago | Jelmer Vernooij | Change root id. | 1.4 KB |
|
|
|
hg.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 2.7 KB |
|
|
|
interrepo.py |
7143.22.3 | 6 years ago | Jelmer Vernooij | merge trunk. | 28.9 KB |
|
|
|
mapping.py |
7358.13.1 | 6 years ago | Jelmer Vernooij | Drop file id roundtripping support in Git. Stashi | 22.1 KB |
|
|
|
memorytree.py |
7358.13.1 | 6 years ago | Jelmer Vernooij | Drop file id roundtripping support in Git. Stashi | 8.2 KB |
|
|
|
object_store.py |
7358.14.2 | 6 years ago | Jelmer Vernooij | Merge trunk. | 30.9 KB |
|
|
|
pristine_tar.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 3.5 KB |
|
|
|
push.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 3.8 KB |
|
|
|
refs.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 6.2 KB |
|
|
|
remote.py |
7380.1.1 | 6 years ago | Jelmer Vernooij | Several more fixes for git merge proposals. | 33.5 KB |
|
|
|
repository.py |
7143.22.3 | 6 years ago | Jelmer Vernooij | merge trunk. | 24.4 KB |
|
|
|
revspec.py |
7309.1.1 | 6 years ago | Jelmer Vernooij | Merge lp:brz/3.0. | 4.2 KB |
|
|
|
roundtrip.py |
7358.13.1 | 6 years ago | Jelmer Vernooij | Drop file id roundtripping support in Git. Stashi | 4.7 KB |
|
|
|
send.py |
7358.16.1 | 6 years ago | Jelmer Vernooij | Don't make TreeChange tuple-like objects anymore, | 7.2 KB |
|
|
|
server.py |
7143.15.3 | 7 years ago | Jelmer Vernooij | Fix pep8 issues in breezy.git. | 5.7 KB |
|
|
|
TODO |
6883.23.26 | 7 years ago | Jelmer Vernooij | Update TODO. | 72 bytes |
|
|
|
transportgit.py |
7371.4.4 | 6 years ago | Jelmer Vernooij | Pull in more fixes from janitor. | 25.4 KB |
|
|
|
tree.py |
7397.2.3 | 6 years ago | Jelmer Vernooij | Fix passing directories in specific_files in GitWo | 57.7 KB |
|
|
|
unpeel_map.py |
7356.1.5 | 6 years ago | Jelmer Vernooij | Use more ExitStacks. | 2.8 KB |
|
|
|
urls.py |
7141.8.5 | 7 years ago | Jelmer Vernooij | Merge trunk. | 2.4 KB |
|
|
|
workingtree.py |
7396.1.1 | 6 years ago | Jelmer Vernooij | Remove the unused has_or_had_id call. | 52.1 KB |
|
|