← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to .rsyncexclude

  • Committer: Martin Pool
  • Date: 2005-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

Show diffs side-by-side

added added

removed removed

Lines of Context:
.rsyncexclude
 
1
*.pyc
 
2
*.pyo
 
3
*~
 
4
# arch can bite me
 
5
{arch}
 
6
.arch-ids
 
7
,,*
 
8
++*
 
9
/doc/*.html
 
10
*.tmp
 
11
bzr-test.log
 
12
[#]*#
 
13
.#*
 
14
testrev.*
 
15
/tmp
 
16
# do want this after all
 
17
+ CHANGELOG