- Committer: John Arbash Meinel
- Date: 2008-07-31 19:12:59 UTC
- mto: (3697.7.4 1.7)
- Revision ID: john@arbash-meinel.com-20080731191259-81qy04c3h4bxir0s
Several updates.
Add a document describing the merge algorithm, and the rationale
for the different steps.
Change the sha1 algorithm to use get_file_sha1() rather than assuming the
inventory entries text_sha1 value is correct. (It is always None for working trees.)
For sha1-values specifically, don't allow overruling an LCA value when one tip
seems to supersede the other's value. We will still do this for names and parent_ids.
Add tests that we conflict if lcas disagree and tips do not have the same content,
even if one of them is an lca value, and one is newer.
Add a document describing the merge algorithm, and the rationale
for the different steps.
Change the sha1 algorithm to use get_file_sha1() rather than assuming the
inventory entries text_sha1 value is correct. (It is always None for working trees.)
For sha1-values specifically, don't allow overruling an LCA value when one tip
seems to supersede the other's value. We will still do this for names and parent_ids.
Add tests that we conflict if lcas disagree and tips do not have the same content,
even if one of them is an lca value, and one is newer.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
3504.4.8 | 16 years ago | John Arbash Meinel | Some code cleanups. Remove extra comments. Use 64 | 918 bytes |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
3015.3.34 | 16 years ago | Daniel Watkins | Cleared out BRANCH.TODO. | 150 bytes |
|
|
bzr |
3517.1.1 | 16 years ago | Martin Pool | Set locale from environment for third party libs a | 5.2 KB |
|
|
|
bzr.ico |
1861.2.16 | 18 years ago | Alexander Belchenko | new official bzr.ico | 7.2 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
generate_docs.py |
2911.6.1 | 17 years ago | Blake Winton | Change 'print >> f,'s to 'f.write('s. | 2.9 KB |
|
|
|
INSTALL |
2696.2.4 | 17 years ago | Aaron Bentley | Fix typo | 1.4 KB |
|
|
|
Makefile |
3557.1.3 | 16 years ago | John Arbash Meinel | trivial tweak of Makefile to use the PYTHON variab | 8.4 KB |
|
|
|
NEWS |
3567.4.14 | 16 years ago | John Arbash Meinel | Update NEWS about the make_branch_builder test hel | 258 KB |
|
|
|
profile_imports.py |
1996.3.36 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2070 | 5.4 KB |
|
|
|
README |
3286 | 16 years ago | Canonical.com Patch Queue Manager | Start 1.4 development | 3.3 KB |
|
|
|
setup.py |
3557.2.9 | 16 years ago | John Arbash Meinel | Alexander noticed I typed macro instead of macros. | 12.6 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|