~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 5020.1.1
• compare with another revision
• download diff
• download tarball
• view history from revision 5020.1.1

• reverse the comparison (5020.1.1 to 3985.2.5)
• stop comparing with revision 3985.2.5

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_remerge.py

12

12

#

13

13

# You should have received a copy of the GNU General Public License

14

14

# along with this program; if not, write to the Free Software

15

 

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 

15

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

16

16

 

17

17

 

18

18

import os

85

85

                           'remerge --merge-type weave', retcode=1)

86

86

 

87

87

        self.failUnlessExists('hello.OTHER')

88

 

        self.failIfExists('hello.BASE')

 

88

        self.failUnless('hello.BASE')

89

89

        self.assertFalse('|||||||' in conflict_text)

90

90

        self.assertFalse('hi world' in conflict_text)

91

91

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1