/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/patch.py

  • Committer: John Arbash Meinel
  • Date: 2007-03-20 00:49:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2366.
  • Revision ID: john@arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import errno
48
48
    if status < 0:
49
49
        raise Exception("%s killed by signal %i" (args[0], -status))
50
50
    return stdout, stderr, status
51
 
 
 
51
    
52
52
 
53
53
def patch(patch_contents, filename, output_filename=None, reverse=False):
54
54
    """Apply a patch to a file, to produce another output file.  This is should
72
72
        args.extend(("-o", output_filename))
73
73
    args.append(filename)
74
74
    stdout, stderr, status = write_to_cmd(args, patch_contents)
75
 
    return status
 
75
    return status 
76
76
 
77
77
 
78
78
def diff3(out_file, mine_path, older_path, yours_path):