/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_modified.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_modified.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
19
"""Black-box tests for 'bzr modified', which shows modified files."""
50
50
        # with unknown file, still nothing modified
51
51
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
52
52
        check_modified('')
53
 
 
 
53
        
54
54
        # after add, not modified
55
55
        tree.add(name)
56
56
        check_modified('')
60
60
        check_modified('')
61
61
 
62
62
        # modify the file
63
 
        self.build_tree_contents([(name, 'changed\n')])
 
63
        self.build_tree_contents([(name, 'changed\n')]) 
64
64
        check_modified(output + '\n')
65
 
 
 
65
        
66
66
        # check null seps - use the unquoted raw name here
67
67
        check_modified(name + '\0', null=True)
68
68