mergetracking_data

Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge the fix-log-mergeinfo-tests branch to trunk.

This pythonifies the basic-merge.dump file, which should make keeping the

'log -g' tests current with trunk easier. This is also a step in fixing

'log -g' to work with mergeinfoless copies.

  1. … 2 more files in changeset.
Add a new dumpfile for mergetracking-related tests. The file is largely based

on markphip's sample dumpfile for the Merge Tracking Early Adopter program

(http://merge-tracking.open.collab.net/servlets/ProjectProcess?documentContainer=c2__Sample%20repository__Explanation%20of%20Repository%20Contents).

Modify one of the log tests to use this dumpfile.

* subversion/tests/cmdline/mergetrackin_data/basic-merge.dump:

New dumpfile.

* subversion/tests/cmdline/log_tests.py

(simple_merge_sensitive_log): Rename from this...

(merge_sensitive_log_single_revision): ...to this. Instead of running an

existing merge test to generate an interesting history, load the

basic-merge.dump file instead. Adjust the expected results to reflect

using this dumpfile.

  1. … 1 more file in changeset.